| Message ID | 20080922195718t-sato@mail.jp.nec.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
Hi, On Mon, Sep 22, 2008 at 07:57:18PM +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> > --- > ops_super.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff -uprN -X linux-2.6.27-rc7-lockfs-ext4/Documentation/dontdiff linux-2.6.27-rc7-lockfs-ext4/fs/gfs2/ops_super.c linux > -2.6.27-rc7-lockfs-gfs2/fs/gfs2/ops_super.c > --- linux-2.6.27-rc7-lockfs-ext4/fs/gfs2/ops_super.c 2008-09-22 07:29:55.000000000 +0900 > +++ linux-2.6.27-rc7-lockfs-gfs2/fs/gfs2/ops_super.c 2008-09-22 10:52:16.000000000 +0900 > @@ -166,13 +166,13 @@ static int gfs2_sync_fs(struct super_blo > * > */ > > -static void gfs2_write_super_lockfs(struct super_block *sb) > +static int gfs2_write_super_lockfs(struct super_block *sb) > { > struct gfs2_sbd *sdp = sb->s_fs_info; > int error; > > if (test_bit(SDF_SHUTDOWN, &sdp->sd_flags)) > - return; > + return 0; > Since this now returns a status, then this should indicate a failure I think. Perhaps -EINVAL would be suitable? Otherwise it looks good from a gfs2 perspective, Steve. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff -uprN -X linux-2.6.27-rc7-lockfs-ext4/Documentation/dontdiff linux-2.6.27-rc7-lockfs-ext4/fs/gfs2/ops_super.c linux -2.6.27-rc7-lockfs-gfs2/fs/gfs2/ops_super.c --- linux-2.6.27-rc7-lockfs-ext4/fs/gfs2/ops_super.c 2008-09-22 07:29:55.000000000 +0900 +++ linux-2.6.27-rc7-lockfs-gfs2/fs/gfs2/ops_super.c 2008-09-22 10:52:16.000000000 +0900 @@ -166,13 +166,13 @@ static int gfs2_sync_fs(struct super_blo * */ -static void gfs2_write_super_lockfs(struct super_block *sb) +static int gfs2_write_super_lockfs(struct super_block *sb) { struct gfs2_sbd *sdp = sb->s_fs_info; int error; if (test_bit(SDF_SHUTDOWN, &sdp->sd_flags)) - return; + return 0; for (;;) { error = gfs2_freeze_fs(sdp); @@ -192,6 +192,7 @@ static void gfs2_write_super_lockfs(stru fs_err(sdp, "retrying...\n"); msleep(1000); } + return 0; } /** @@ -200,9 +201,10 @@ static void gfs2_write_super_lockfs(stru * */ -static void gfs2_unlockfs(struct super_block *sb) +static int gfs2_unlockfs(struct super_block *sb) { gfs2_unfreeze_fs(sb->s_fs_info); + return 0; } /**