ext4: kill ext4_mballoc_ready

This variable, introduced in commit 9c191f70, is unnecessary: it is set
once the module has been initialized correctly, and ext4_fill_super
cannot run unless the module has been initialized correctly.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index ecc37e1034358d769ab29971e9d2301fb9e2b3bc..2f550519e0aac59045bada00007ca33c1c64db9a 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -55,7 +55,6 @@
 
 static struct ext4_lazy_init *ext4_li_info;
 static struct mutex ext4_li_mtx;
-static int ext4_mballoc_ready;
 static struct ratelimit_state ext4_mount_msg_ratelimit;
 
 static int ext4_load_journal(struct super_block *, struct ext4_super_block *,
@@ -3795,12 +3794,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
        sbi->s_journal->j_commit_callback = ext4_journal_commit_callback;
 
 no_journal:
-       if (ext4_mballoc_ready) {
-               sbi->s_mb_cache = ext4_xattr_create_cache();
-               if (!sbi->s_mb_cache) {
-                       ext4_msg(sb, KERN_ERR, "Failed to create an mb_cache");
-                       goto failed_mount_wq;
-               }
+       sbi->s_mb_cache = ext4_xattr_create_cache();
+       if (!sbi->s_mb_cache) {
+               ext4_msg(sb, KERN_ERR, "Failed to create an mb_cache");
+               goto failed_mount_wq;
        }
 
        if ((DUMMY_ENCRYPTION_ENABLED(sbi) || ext4_has_feature_encrypt(sb)) &&
@@ -5361,8 +5358,6 @@ static int __init ext4_init_fs(void)
        err = ext4_init_mballoc();
        if (err)
                goto out2;
-       else
-               ext4_mballoc_ready = 1;
        err = init_inodecache();
        if (err)
                goto out1;
@@ -5378,7 +5373,6 @@ out:
        unregister_as_ext3();
        destroy_inodecache();
 out1:
-       ext4_mballoc_ready = 0;
        ext4_exit_mballoc();
 out2:
        ext4_exit_sysfs();