diff options
| author | Jan Kara <jack@suse.cz> | 2020-02-21 11:08:35 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-28 15:42:51 +0100 |
| commit | 7800e2466dd197a05fc7e4bd066a5db70388cd0a (patch) | |
| tree | ff6411f501dfe7b85b72d92c7a8bd27e64bfc301 /fs | |
| parent | c7071c326ff72a52c19d1b52a2aa9faaf9649645 (diff) | |
| download | linux-stable-7800e2466dd197a05fc7e4bd066a5db70388cd0a.tar.gz linux-stable-7800e2466dd197a05fc7e4bd066a5db70388cd0a.tar.bz2 linux-stable-7800e2466dd197a05fc7e4bd066a5db70388cd0a.zip | |
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 <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a141d46f6884..3e9f1af41063 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2743,7 +2743,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, |