Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c853788 authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Sasha Levin
Browse files

ext4: ignore quota mount options if the quota feature is enabled 



[ Upstream commit c325a67c72903e1cc30e990a15ce745bda0dbfde ]

Previously, ext4 would fail the mount if the file system had the quota
feature enabled and quota mount options (used for the older quota
setups) were present.  This broke xfstests, since xfs silently ignores
the usrquote and grpquota mount options if they are specified.  This
commit changes things so that we are consistent with xfs; having the
mount options specified is harmless, so no sense break users by
forbidding them.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 1cbab78d

fs/ext4/super.c

+11 −11
Original line number Diff line number Diff line
@@ -1281,9 +1281,9 @@ static int set_qf_name(struct super_block *sb, int qtype, substring_t *args) 
		return -1;

	}

	if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA)) {

		ext4_msg(sb, KERN_ERR, "Cannot set journaled quota options "

			 "when QUOTA feature is enabled");

		return -1;

		ext4_msg(sb, KERN_INFO, "Journaled quota options "

			 "ignored when QUOTA feature is enabled");

		return 1;

	}

	qname = match_strdup(args);

	if (!qname) {
@@ -1622,10 +1622,10 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token, 
		}

		if (EXT4_HAS_RO_COMPAT_FEATURE(sb,

					       EXT4_FEATURE_RO_COMPAT_QUOTA)) {

			ext4_msg(sb, KERN_ERR,

				 "Cannot set journaled quota options "

			ext4_msg(sb, KERN_INFO,

				 "Quota format mount options ignored "

				 "when QUOTA feature is enabled");

			return -1;

			return 1;

		}

		sbi->s_jquota_fmt = m->mount_opt;

#endif
@@ -1677,11 +1677,11 @@ static int parse_options(char *options, struct super_block *sb, 
#ifdef CONFIG_QUOTA

	if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA) &&

	    (test_opt(sb, USRQUOTA) || test_opt(sb, GRPQUOTA))) {

		ext4_msg(sb, KERN_ERR, "Cannot set quota options when QUOTA "

			 "feature is enabled");

		return 0;

	}

	if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) {

		ext4_msg(sb, KERN_INFO, "Quota feature enabled, usrquota and grpquota "

			 "mount options ignored.");

		clear_opt(sb, USRQUOTA);

		clear_opt(sb, GRPQUOTA);

	} else if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) {

		if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA])

			clear_opt(sb, USRQUOTA);