Hi,
OK.
I've fixed the patch for xfs as following.
Could you review it?
If it's OK, I will include it in new freeze patch-set.
Signed-off-by: Takashi Sato <t-sato@yk.jp.nec.com>
Signed-off-by: Masayuki Hamaguchi <m-hamaguchi@ys.jp.nec.com>
---
diff -uprN -X linux-2.6.27-rc7.org/Documentation/dontdiff linux-2.6.27-rc7-ext4_3/fs/xfs/linux-2.6/xfs_super.c linux-2.6
.27-rc7-xfs_4/fs/xfs/linux-2.6/xfs_super.c
--- linux-2.6.27-rc7-ext4_3/fs/xfs/linux-2.6/xfs_super.c 2008-09-24 10:48:02.000000000 +0900
+++ linux-2.6.27-rc7-xfs_4/fs/xfs/linux-2.6/xfs_super.c 2008-09-24 11:24:08.000000000 +0900
@@ -1351,14 +1351,14 @@ xfs_fs_remount(
* need to take care of themetadata. Once that's done write a dummy
* record to dirty the log in case of a crash while frozen.
*/
-STATIC void
+STATIC int
xfs_fs_lockfs(
struct super_block *sb)
{
struct xfs_mount *mp = XFS_M(sb);
xfs_attr_quiesce(mp);
- xfs_fs_log_dummy(mp);
+ return -xfs_fs_log_dummy(mp);
}
STATIC int
diff -uprN -X linux-2.6.27-rc7.org/Documentation/dontdiff linux-2.6.27-rc7-ext4_3/fs/xfs/xfs_fsops.c linux-2.6.27-rc7-xf
s_4/fs/xfs/xfs_fsops.c
--- linux-2.6.27-rc7-ext4_3/fs/xfs/xfs_fsops.c 2008-09-24 10:48:02.000000000 +0900
+++ linux-2.6.27-rc7-xfs_4/fs/xfs/xfs_fsops.c 2008-09-24 11:47:08.000000000 +0900
@@ -589,17 +589,19 @@ out:
return 0;
}
-void
+int
xfs_fs_log_dummy(
xfs_mount_t *mp)
{
xfs_trans_t *tp;
xfs_inode_t *ip;
+ int error;
tp = _xfs_trans_alloc(mp, XFS_TRANS_DUMMY1);
- if (xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0)) {
+ error = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0);
+ if (error) {
xfs_trans_cancel(tp, 0);
- return;
+ return error;
}
ip = mp->m_rootip;
@@ -609,9 +611,10 @@ xfs_fs_log_dummy(
xfs_trans_ihold(tp, ip);
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
xfs_trans_set_sync(tp);
- xfs_trans_commit(tp, 0);
+ error = xfs_trans_commit(tp, 0);
xfs_iunlock(ip, XFS_ILOCK_EXCL);
+ return error;
}
...
