[B][SRU][PATCH 1/1] ext4: fix mount failure with quota configured as module

[Po-Hsu Lin]

From: Jan Kara <jack at suse.cz>

BugLink: https://bugs.launchpad.net/bugs/1868665

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 at suse.cz>
Signed-off-by: Theodore Ts'o <tytso at mit.edu>
Cc: stable at kernel.org
(cherry picked from commit 9db176bceb5c5df4990486709da386edadc6bd1d)
Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
---
 fs/ext4/super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 93bc2d1..52e30fa 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2890,7 +2890,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,
-- 
2.7.4