Skip to contentSkip to conversation

ext[234]: cleanup ext[234]_bg_num_gdb()

PATCH In review Akinobu Mita 2 participants 2 messages Dec 8, 2007 – Dec 12, 2007

Subsystems (2)
ext4 file system ext2 file system
lore
Share & tools
lore

Akinobu Mita

author
#0 lore raw

PATCH 1/1 ext[234]: cleanup ext[234]_bg_num_gdb()

Use ext[234]_bg_has_super() to remove duplicate code.

Cc Stephen Tweedie <[email protected]>
Cc Andrew Morton <[email protected]>
Cc [email protected]
Signed-off-by Akinobu Mita <[email protected]>
---
 fs/ext2/balloc.c |    5 +----
 fs/ext3/balloc.c |    6 +-----
 fs/ext4/balloc.c |    6 +-----
 3 files changed, 3 insertions(+), 14 deletions(-)
fs/ext2/balloc.c +1 -4
Index: 2.6-git/fs/ext2/balloc.c
===================================================================
@@ -1466,9 +1466,6 @@ int ext2_bg_has_super(struct super_block
  */
 unsigned long ext2_bg_num_gdb(struct super_block *sb, int group)
 {
-	if (EXT2_HAS_RO_COMPAT_FEATURE(sb,EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)&&
-	    !ext2_group_sparse(group))
-		return 0;
-	return EXT2_SB(sb)->s_gdb_count;
+	return ext2_bg_has_super(sb, group) ? EXT2_SB(sb)->s_gdb_count : 0;
 }
fs/ext3/balloc.c +1 -5
Index: 2.6-git/fs/ext3/balloc.c
===================================================================
@@ -1782,11 +1782,7 @@ static unsigned long ext3_bg_num_gdb_met
 
 static unsigned long ext3_bg_num_gdb_nometa(struct super_block *sb, int group)
 {
-	if (EXT3_HAS_RO_COMPAT_FEATURE(sb,
-				EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER) &&
-			!ext3_group_sparse(group))
-		return 0;
-	return EXT3_SB(sb)->s_gdb_count;
+	return ext3_bg_has_super(sb, group) ? EXT3_SB(sb)->s_gdb_count : 0;
 }
 
 /**
fs/ext4/balloc.c +1 -5
Index: 2.6-git/fs/ext4/balloc.c
===================================================================
@@ -1902,11 +1902,7 @@ static unsigned long ext4_bg_num_gdb_met
 
 static unsigned long ext4_bg_num_gdb_nometa(struct super_block *sb, int group)
 {
-	if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
-				EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER) &&
-			!ext4_group_sparse(group))
-		return 0;
-	return EXT4_SB(sb)->s_gdb_count;
+	return ext4_bg_has_super(sb, group) ? EXT4_SB(sb)->s_gdb_count : 0;
 }
 
 /**
#1 lore raw
Quoted 1 line · On Sun, 9 Dec 2007 00:31:56 +0900 Akinobu Mita <[email protected]> wrote:

Use ext[234]_bg_has_super() to remove duplicate code.

Would prefer one patch per filesystem, please.

After fixing the rejects, I now have patches which affect ext2 and ext3 but which have a merging dependency upon ext4.