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

Commit 2335d05f authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Theodore Ts'o
Browse files

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: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 7a2508e1

fs/ext4/super.c

+4 −10
Original line number Diff line number Diff line
@@ -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,13 +3794,11 @@ 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;

	}

	}



	if ((DUMMY_ENCRYPTION_ENABLED(sbi) || ext4_has_feature_encrypt(sb)) &&

	    (blocksize != PAGE_CACHE_SIZE)) {
@@ -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 @@ static int __init ext4_init_fs(void) 
	unregister_as_ext3();

	destroy_inodecache();

out1:

	ext4_mballoc_ready = 0;

	ext4_exit_mballoc();

out2:

	ext4_exit_sysfs();