ext4: fix mount failure with quota configured as module

jankara · tytso · commit 9db176bceb5c · 2020-02-21T19:32:07.000-05:00
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: d65d87a ("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
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -3034,7 +3034,7 @@ static int ext4_feature_set_ok(struct super_block *sb, int readonly)`
`3034`	`3034`	`return 0;`
`3035`	`3035`	`}`
`3036`	`3036`
`3037`		`-#if !defined(CONFIG_QUOTA) \|\| !defined(CONFIG_QFMT_V2)`
	`3037`	`+#if !IS_ENABLED(CONFIG_QUOTA) \|\| !IS_ENABLED(CONFIG_QFMT_V2)`
`3038`	`3038`	`if (!readonly && (ext4_has_feature_quota(sb) \|\|`
`3039`	`3039`	`ext4_has_feature_project(sb))) {`
`3040`	`3040`	`ext4_msg(sb, KERN_ERR,`