| Message ID | 20200221100835.9332-1-jack@suse.cz |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ext4: Fix mount failure with quota configured as module | expand |
On Fri, Feb 21, 2020 at 11:08:35AM +0100, Jan Kara wrote: > 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. > > Fixes: d65d87a07476 ("ext4: improve explanation of a mount failure caused by a misconfigured kernel") > Signed-off-by: Jan Kara <jack@suse.cz> Whoops, good catch. Thanks, applied. - Ted
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index f464dff09774..576b69d2ca41 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3009,7 +3009,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,
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. Fixes: d65d87a07476 ("ext4: improve explanation of a mount failure caused by a misconfigured kernel") Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)