OSDN Git Service

ext2: code cleanup for descriptor_loc()
authorChengguang Xu <cgxu519@mykernel.net>
Fri, 15 Nov 2019 22:49:00 +0000 (06:49 +0800)
committerJan Kara <jack@suse.cz>
Tue, 19 Nov 2019 16:04:38 +0000 (17:04 +0100)
Code cleanup by removing unnecessary variable
in descriptor_loc().

Link: https://lore.kernel.org/r/20191115224900.2613-1-cgxu519@mykernel.net
Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
Signed-off-by: Jan Kara <jack@suse.cz>
fs/ext2/super.c

index 4cd401a..bcffe25 100644 (file)
@@ -800,7 +800,6 @@ static unsigned long descriptor_loc(struct super_block *sb,
 {
        struct ext2_sb_info *sbi = EXT2_SB(sb);
        unsigned long bg, first_meta_bg;
-       int has_super = 0;
        
        first_meta_bg = le32_to_cpu(sbi->s_es->s_first_meta_bg);
 
@@ -808,10 +807,8 @@ static unsigned long descriptor_loc(struct super_block *sb,
            nr < first_meta_bg)
                return (logic_sb_block + nr + 1);
        bg = sbi->s_desc_per_block * nr;
-       if (ext2_bg_has_super(sb, bg))
-               has_super = 1;
 
-       return ext2_group_first_block_no(sb, bg) + has_super;
+       return ext2_group_first_block_no(sb, bg) + ext2_bg_has_super(sb, bg);
 }
 
 static int ext2_fill_super(struct super_block *sb, void *data, int silent)