From 4c1bd5a90c4e716e5bde33f01a40bb66dc4a9903 Mon Sep 17 00:00:00 2001 From: Lukas Czerner Date: Tue, 4 Jan 2022 15:35:18 +0100 Subject: ext4: only set EXT4_MOUNT_QUOTA when journalled quota file is specified Only set EXT4_MOUNT_QUOTA when journalled quota file is specified, otherwise simply disabling specific quota type (usrjquota=) will also set the EXT4_MOUNT_QUOTA super block option. Signed-off-by: Lukas Czerner Fixes: e6e268cb6822 ("ext4: move quota configuration out of handle_mount_opt()") Link: https://lore.kernel.org/r/20220104143518.134465-2-lczerner@redhat.com Signed-off-by: Theodore Ts'o --- fs/ext4/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'fs/ext4') diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 72e4dfc9acaf..435f24787030 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2635,12 +2635,13 @@ static void ext4_apply_quota_options(struct fs_context *fc, continue; qname = ctx->s_qf_names[i]; /* May be NULL */ + if (qname) + set_opt(sb, QUOTA); ctx->s_qf_names[i] = NULL; qname = rcu_replace_pointer(sbi->s_qf_names[i], qname, lockdep_is_held(&sb->s_umount)); if (qname) kfree_rcu(qname); - set_opt(sb, QUOTA); } } -- cgit v1.2.3-59-g8ed1b