Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 859cb936 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

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



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

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fb01bfda

fs/ext2/balloc.c

+1 −4
Original line number Diff line number Diff line
@@ -1533,9 +1533,6 @@ int ext2_bg_has_super(struct super_block *sb, int group) 
 */

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
Original line number Diff line number Diff line
@@ -1848,11 +1848,7 @@ static unsigned long ext3_bg_num_gdb_meta(struct super_block *sb, int group) 


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
Original line number Diff line number Diff line
@@ -2011,11 +2011,7 @@ static unsigned long ext4_bg_num_gdb_meta(struct super_block *sb, 
static unsigned long ext4_bg_num_gdb_nometa(struct super_block *sb,

					ext4_group_t 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;

}



/**