From: Chengguang Xu Date: Tue, 13 Nov 2018 23:23:53 +0000 (+0800) Subject: ext2: remove redundant condition check X-Git-Tag: 4.21-smb3-small-fixes~76^2~3 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=569ae9209425560e1a94114231d0782e1cc19df1;p=sfrench%2Fcifs-2.6.git ext2: remove redundant condition check ext2_xattr_destroy_cache() can handle NULL pointer correctly, so there is no need to check NULL pointer before calling ext2_xattr_destroy_cache(). Signed-off-by: Chengguang Xu Signed-off-by: Jan Kara --- diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 5e2861b947a6..94cd10c463c2 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -148,10 +148,9 @@ static void ext2_put_super (struct super_block * sb) ext2_quota_off_umount(sb); - if (sbi->s_ea_block_cache) { - ext2_xattr_destroy_cache(sbi->s_ea_block_cache); - sbi->s_ea_block_cache = NULL; - } + ext2_xattr_destroy_cache(sbi->s_ea_block_cache); + sbi->s_ea_block_cache = NULL; + if (!sb_rdonly(sb)) { struct ext2_super_block *es = sbi->s_es; @@ -1197,8 +1196,7 @@ cantfind_ext2: sb->s_id); goto failed_mount; failed_mount3: - if (sbi->s_ea_block_cache) - ext2_xattr_destroy_cache(sbi->s_ea_block_cache); + ext2_xattr_destroy_cache(sbi->s_ea_block_cache); percpu_counter_destroy(&sbi->s_freeblocks_counter); percpu_counter_destroy(&sbi->s_freeinodes_counter); percpu_counter_destroy(&sbi->s_dirs_counter);