git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
xfs
/
xfs_buf_item.c
diff --git
a/fs/xfs/xfs_buf_item.c
b/fs/xfs/xfs_buf_item.c
index
a4aa539
..
07e2324
100644
(file)
--- a/
fs/xfs/xfs_buf_item.c
+++ b/
fs/xfs/xfs_buf_item.c
@@
-23,6
+23,7
@@
#include "xfs_inum.h"
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_inum.h"
#include "xfs_trans.h"
#include "xfs_sb.h"
+#include "xfs_dir.h"
#include "xfs_dmapi.h"
#include "xfs_mount.h"
#include "xfs_buf_item.h"
#include "xfs_dmapi.h"
#include "xfs_mount.h"
#include "xfs_buf_item.h"
@@
-97,12
+98,12
@@
xfs_buf_item_flush_log_debug(
}
/*
}
/*
- * This function is called to verify that our callers have logged
+ * This function is called to verify that our caller
'
s have logged
* all the bytes that they changed.
*
* It does this by comparing the original copy of the buffer stored in
* the buf log item's bli_orig array to the current copy of the buffer
* all the bytes that they changed.
*
* It does this by comparing the original copy of the buffer stored in
* the buf log item's bli_orig array to the current copy of the buffer
- * and ensuring that all bytes which mis
match
are set in the bli_logged
+ * and ensuring that all bytes which mis
compare
are set in the bli_logged
* array of the buf log item.
*/
STATIC void
* array of the buf log item.
*/
STATIC void
@@
-1029,9
+1030,9
@@
xfs_buf_iodone_callbacks(
if ((XFS_BUF_TARGET(bp) != lasttarg) ||
(time_after(jiffies, (lasttime + 5*HZ)))) {
lasttime = jiffies;
if ((XFS_BUF_TARGET(bp) != lasttarg) ||
(time_after(jiffies, (lasttime + 5*HZ)))) {
lasttime = jiffies;
-
cmn_err(CE_ALERT, "Device %s, XFS metadata write error
"
-
"
block 0x%llx in %s",
-
XFS_BUFTARG_NAME(XFS_BUF_TARGET(bp)
),
+
prdev("XFS write error in file system meta-data
"
+
"
block 0x%llx in %s",
+
XFS_BUF_TARGET(bp
),
(__uint64_t)XFS_BUF_ADDR(bp), mp->m_fsname);
}
lasttarg = XFS_BUF_TARGET(bp);
(__uint64_t)XFS_BUF_ADDR(bp), mp->m_fsname);
}
lasttarg = XFS_BUF_TARGET(bp);
@@
-1107,7
+1108,7
@@
xfs_buf_error_relse(
XFS_BUF_ERROR(bp,0);
xfs_buftrace("BUF_ERROR_RELSE", bp);
if (! XFS_FORCED_SHUTDOWN(mp))
XFS_BUF_ERROR(bp,0);
xfs_buftrace("BUF_ERROR_RELSE", bp);
if (! XFS_FORCED_SHUTDOWN(mp))
- xfs_force_shutdown(mp,
SHUTDOWN_ME
TA_IO_ERROR);
+ xfs_force_shutdown(mp,
XFS_METADA
TA_IO_ERROR);
/*
* We have to unpin the pinned buffers so do the
* callbacks.
/*
* We have to unpin the pinned buffers so do the
* callbacks.