ext4: remove redundant condition check

ext4_xattr_destroy_cache() can handle NULL pointer correctly,
so there is no need to check NULL pointer before calling
ext4_xattr_destroy_cache().

Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 97a1cef29ef8a2470f7d361f21c9347d7d9084bd..a39726cc78bc52f13e1f74ea68c2d736443c7bcf 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1023,14 +1023,13 @@ static void ext4_put_super(struct super_block *sb)
                invalidate_bdev(sbi->journal_bdev);
                ext4_blkdev_remove(sbi);
        }
-       if (sbi->s_ea_inode_cache) {
-               ext4_xattr_destroy_cache(sbi->s_ea_inode_cache);
-               sbi->s_ea_inode_cache = NULL;
-       }
-       if (sbi->s_ea_block_cache) {
-               ext4_xattr_destroy_cache(sbi->s_ea_block_cache);
-               sbi->s_ea_block_cache = NULL;
-       }
+
+       ext4_xattr_destroy_cache(sbi->s_ea_inode_cache);
+       sbi->s_ea_inode_cache = NULL;
+
+       ext4_xattr_destroy_cache(sbi->s_ea_block_cache);
+       sbi->s_ea_block_cache = NULL;
+
        if (sbi->s_mmp_tsk)
                kthread_stop(sbi->s_mmp_tsk);
        brelse(sbi->s_sbh);
@@ -4545,14 +4544,12 @@ failed_mount4:
        if (EXT4_SB(sb)->rsv_conversion_wq)
                destroy_workqueue(EXT4_SB(sb)->rsv_conversion_wq);
 failed_mount_wq:
-       if (sbi->s_ea_inode_cache) {
-               ext4_xattr_destroy_cache(sbi->s_ea_inode_cache);
-               sbi->s_ea_inode_cache = NULL;
-       }
-       if (sbi->s_ea_block_cache) {
-               ext4_xattr_destroy_cache(sbi->s_ea_block_cache);
-               sbi->s_ea_block_cache = NULL;
-       }
+       ext4_xattr_destroy_cache(sbi->s_ea_inode_cache);
+       sbi->s_ea_inode_cache = NULL;
+
+       ext4_xattr_destroy_cache(sbi->s_ea_block_cache);
+       sbi->s_ea_block_cache = NULL;
+
        if (sbi->s_journal) {
                jbd2_journal_destroy(sbi->s_journal);
                sbi->s_journal = NULL;