Skip to contentSkip to conversation

gfs2: Fix error handling in write_super_lockfs/unlockfs

PATCH In review Takashi Sato 2 participants 2 messages Sep 22, 2008

Subsystems (3)
VFS Device mapper GFS2 file system
lore
Share & tools
lore

Takashi Sato

author
#0 lore raw

PATCH 6/10 gfs2: Fix error handling in write_super_lockfs/unlockfs

I've changed write_super_lockfs/unlockfs so that they always return 0 (success) to keep a current behavior.

Signed-off-by Takashi Sato <[email protected]>
Signed-off-by Masayuki Hamaguchi <[email protected]>
---
 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

fs/gfs2/ops_super.c +5 -3
@@ -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;
 }
 
 /**
#1 lore raw

Hi,

Quoted 17 lines · Takashi Sato

I've changed write_super_lockfs/unlockfs so that they always return 0 (success) to keep a current behavior.

Signed-off-by Takashi Sato <[email protected]>
Signed-off-by Masayuki Hamaguchi <[email protected]>
---
 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

fs/gfs2/ops_super.c +0 -0
@@ -166,13 +166,13 @@ static int gfs2_sync_fs(struct super_blo
  *
  */

fs/gfs2/ops_super.c static int gfs2_sync_fs(struct super_blo · line 176

Quoted 10 lines
fs/gfs2/ops_super.c +2 -2
-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.