Message ID | 20080922195637t-sato@mail.jp.nec.com |
---|---|
State | Superseded, archived |
Headers | show |
On Mon, Sep 22, 2008 at 07:56:37PM +0900, Takashi Sato wrote: > I've changed write_super_lockfs/unlockfs so that they always return > 0 (success) to keep a current behavior. > > Signed-off-by: Takashi Sato <t-sato@yk.jp.nec.com> > Signed-off-by: Masayuki Hamaguchi <m-hamaguchi@ys.jp.nec.com> > --- > xfs_super.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff -uprN -X linux-2.6.27-rc7-lockfs/Documentation/dontdiff linux-2.6.27-rc7-lockfs/fs/xfs/linux-2.6/xfs_super.c linux- > 2.6.27-rc7-lockfs-xfs/fs/xfs/linux-2.6/xfs_super.c > --- linux-2.6.27-rc7-lockfs/fs/xfs/linux-2.6/xfs_super.c 2008-09-22 07:29:55.000000000 +0900 > +++ linux-2.6.27-rc7-lockfs-xfs/fs/xfs/linux-2.6/xfs_super.c 2008-09-22 10:13:39.000000000 +0900 > @@ -1351,7 +1351,7 @@ 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) > { > @@ -1359,6 +1359,7 @@ xfs_fs_lockfs( > > xfs_attr_quiesce(mp); > xfs_fs_log_dummy(mp); > + return 0; > } xfs_fs_log_dummy() currently is void because it had nowhere to return errors to. It silently throws away errors because of this. Hence the correct thing to do here is to fix xfs_fs_log_dummy() to return the errors it currently ignores. i.e. catch the errors from xfs_trans_reserve() and xfs_trans_commit() calls in xfs_fs_log_dummy(). Cheers, Dave.
diff -uprN -X linux-2.6.27-rc7-lockfs/Documentation/dontdiff linux-2.6.27-rc7-lockfs/fs/xfs/linux-2.6/xfs_super.c linux- 2.6.27-rc7-lockfs-xfs/fs/xfs/linux-2.6/xfs_super.c --- linux-2.6.27-rc7-lockfs/fs/xfs/linux-2.6/xfs_super.c 2008-09-22 07:29:55.000000000 +0900 +++ linux-2.6.27-rc7-lockfs-xfs/fs/xfs/linux-2.6/xfs_super.c 2008-09-22 10:13:39.000000000 +0900 @@ -1351,7 +1351,7 @@ 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) { @@ -1359,6 +1359,7 @@ xfs_fs_lockfs( xfs_attr_quiesce(mp); xfs_fs_log_dummy(mp); + return 0; } STATIC int