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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
fs
/
xfs
/
xfs_trans_buf.c
diff --git
a/fs/xfs/xfs_trans_buf.c
b/fs/xfs/xfs_trans_buf.c
index
c74c31e
..
60b6b89
100644
(file)
--- a/
fs/xfs/xfs_trans_buf.c
+++ b/
fs/xfs/xfs_trans_buf.c
@@
-24,14
+24,12
@@
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_ag.h"
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_ag.h"
-#include "xfs_dir.h"
#include "xfs_dir2.h"
#include "xfs_dmapi.h"
#include "xfs_mount.h"
#include "xfs_bmap_btree.h"
#include "xfs_alloc_btree.h"
#include "xfs_ialloc_btree.h"
#include "xfs_dir2.h"
#include "xfs_dmapi.h"
#include "xfs_mount.h"
#include "xfs_bmap_btree.h"
#include "xfs_alloc_btree.h"
#include "xfs_ialloc_btree.h"
-#include "xfs_dir_sf.h"
#include "xfs_dir2_sf.h"
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
#include "xfs_dir2_sf.h"
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
@@
-320,7
+318,7
@@
xfs_trans_read_buf(
if (xfs_error_target == target) {
if (((xfs_req_num++) % xfs_error_mod) == 0) {
xfs_buf_relse(bp);
if (xfs_error_target == target) {
if (((xfs_req_num++) % xfs_error_mod) == 0) {
xfs_buf_relse(bp);
-
printk(
"Returning error!\n");
+
cmn_err(CE_DEBUG,
"Returning error!\n");
return XFS_ERROR(EIO);
}
}
return XFS_ERROR(EIO);
}
}
@@
-369,7
+367,7
@@
xfs_trans_read_buf(
*/
if (tp->t_flags & XFS_TRANS_DIRTY)
xfs_force_shutdown(tp->t_mountp,
*/
if (tp->t_flags & XFS_TRANS_DIRTY)
xfs_force_shutdown(tp->t_mountp,
-
XFS_METADA
TA_IO_ERROR);
+
SHUTDOWN_ME
TA_IO_ERROR);
return error;
}
}
return error;
}
}
@@
-414,7
+412,7
@@
xfs_trans_read_buf(
xfs_ioerror_alert("xfs_trans_read_buf", mp,
bp, blkno);
if (tp->t_flags & XFS_TRANS_DIRTY)
xfs_ioerror_alert("xfs_trans_read_buf", mp,
bp, blkno);
if (tp->t_flags & XFS_TRANS_DIRTY)
- xfs_force_shutdown(tp->t_mountp,
XFS_METADA
TA_IO_ERROR);
+ xfs_force_shutdown(tp->t_mountp,
SHUTDOWN_ME
TA_IO_ERROR);
xfs_buf_relse(bp);
return error;
}
xfs_buf_relse(bp);
return error;
}
@@
-423,9
+421,9
@@
xfs_trans_read_buf(
if (xfs_error_target == target) {
if (((xfs_req_num++) % xfs_error_mod) == 0) {
xfs_force_shutdown(tp->t_mountp,
if (xfs_error_target == target) {
if (((xfs_req_num++) % xfs_error_mod) == 0) {
xfs_force_shutdown(tp->t_mountp,
-
XFS_METADA
TA_IO_ERROR);
+
SHUTDOWN_ME
TA_IO_ERROR);
xfs_buf_relse(bp);
xfs_buf_relse(bp);
-
printk("Returning error in trans
!\n");
+
cmn_err(CE_DEBUG, "Returning trans error
!\n");
return XFS_ERROR(EIO);
}
}
return XFS_ERROR(EIO);
}
}