From: Jan Kara Date: Fri, 21 Feb 2020 10:08:35 +0000 (+0100) Subject: ext4: fix mount failure with quota configured as module X-Git-Tag: v5.5.7~58 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d896c49be24566903a9e502b79f750e35638989d;p=users%2Fdwmw2%2Flinux.git 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: Jan Kara Signed-off-by: Theodore Ts'o Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 531ea4f39bb27..f1891e02a3a36 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2989,7 +2989,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,