summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2020-02-21 11:08:35 +0100
committerTheodore Ts'o <tytso@mit.edu>2020-02-21 19:32:07 -0500
commit9db176bceb5c5df4990486709da386edadc6bd1d (patch)
treede32c5c0baeff9ae16aab39018cf7e9ce97dfbba /fs
parent8eedabfd66b68a4623beec0789eac54b8c9d0fb6 (diff)
downloadlinux-stable-9db176bceb5c5df4990486709da386edadc6bd1d.tar.gz
linux-stable-9db176bceb5c5df4990486709da386edadc6bd1d.tar.bz2
linux-stable-9db176bceb5c5df4990486709da386edadc6bd1d.zip
ext4: fix mount failure with quota configured as module
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 <jack@suse.cz> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 6928fc229799..ff1b764b0c0e 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3034,7 +3034,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,