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

Commit 7800e246 authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman
Browse files

ext4: fix mount failure with quota configured as module 

commit 9db176bceb5c5df4990486709da386edadc6bd1d upstream.

When CONFIG_QFMT_V2 is configured as a module, the test in
ext4_feature_set_ok() fails and so mount of filesystems with quota or
project features fails. Fix the test to use IS_ENABLED macro which
works properly even for modules.

Link: https://lore.kernel.org/r/20200221100835.9332-1-jack@suse.cz


Fixes: d65d87a07476 ("ext4: improve explanation of a mount failure caused by a misconfigured kernel")
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c7071c32

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -2743,7 +2743,7 @@ static int ext4_feature_set_ok(struct super_block *sb, int readonly) 
		return 0;

	}



#if !defined(CONFIG_QUOTA) || !defined(CONFIG_QFMT_V2)

#if !IS_ENABLED(CONFIG_QUOTA) || !IS_ENABLED(CONFIG_QFMT_V2)

	if (!readonly && (ext4_has_feature_quota(sb) ||

			  ext4_has_feature_project(sb))) {

		ext4_msg(sb, KERN_ERR,