Commit 4c1bd5a9 authored by Lukas Czerner's avatar Lukas Czerner Committed by Theodore Ts'o
Browse files

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: default avatarLukas Czerner <lczerner@redhat.com>
Fixes: e6e268cb ("ext4: move quota configuration out of handle_mount_opt()")
Link: https://lore.kernel.org/r/20220104143518.134465-2-lczerner@redhat.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 13b215a9

fs/ext4/super.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

		}

	}