Commit dfc5d03f authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: correct mount option parsing to detect when quota options can be changed 



We should not allow user to change quota mount options when quota is
just suspended.  It would make mount options and internal quota state
inconsistent.  Also we should not allow user to change quota format when
quota is turned on.  On the other hand we can just silently ignore when
some option is set to the value it already has (mount does this on
remount).

Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 8f40f672

fs/ext4/super.c

+20 −6
Original line number Diff line number Diff line
@@ -979,7 +979,7 @@ static int parse_options (char *options, struct super_block *sb, 
	int data_opt = 0;

	int option;

#ifdef CONFIG_QUOTA

	int qtype;

	int qtype, qfmt;

	char *qname;

#endif
@@ -1162,7 +1162,9 @@ static int parse_options (char *options, struct super_block *sb, 
		case Opt_grpjquota:

			qtype = GRPQUOTA;

set_qf_name:

			if (sb_any_quota_enabled(sb)) {

			if ((sb_any_quota_enabled(sb) ||

			     sb_any_quota_suspended(sb)) &&

			    !sbi->s_qf_names[qtype]) {

				printk(KERN_ERR

					"EXT4-fs: Cannot change journalled "

					"quota options when quota turned on.\n");
@@ -1200,7 +1202,9 @@ set_qf_name: 
		case Opt_offgrpjquota:

			qtype = GRPQUOTA;

clear_qf_name:

			if (sb_any_quota_enabled(sb)) {

			if ((sb_any_quota_enabled(sb) ||

			     sb_any_quota_suspended(sb)) &&

			    sbi->s_qf_names[qtype]) {

				printk(KERN_ERR "EXT4-fs: Cannot change "

					"journalled quota options when "

					"quota turned on.\n");
@@ -1213,10 +1217,20 @@ clear_qf_name: 
			sbi->s_qf_names[qtype] = NULL;

			break;

		case Opt_jqfmt_vfsold:

			sbi->s_jquota_fmt = QFMT_VFS_OLD;

			break;

			qfmt = QFMT_VFS_OLD;

			goto set_qf_format;

		case Opt_jqfmt_vfsv0:

			sbi->s_jquota_fmt = QFMT_VFS_V0;

			qfmt = QFMT_VFS_V0;

set_qf_format:

			if ((sb_any_quota_enabled(sb) ||

			     sb_any_quota_suspended(sb)) &&

			    sbi->s_jquota_fmt != qfmt) {

				printk(KERN_ERR "EXT4-fs: Cannot change "

					"journaled quota options when "

					"quota turned on.\n");

				return 0;

			}

			sbi->s_jquota_fmt = qfmt;

			break;

		case Opt_quota:

		case Opt_usrquota:

CRA Git | Maintained and supported by SUSTech CRA and CCSE