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

Commit ee0d5ffe authored by Jan Kara's avatar Jan Kara Committed by Mark Fasheh
Browse files

ext3: Use sb_any_quota_loaded() instead of sb_any_quota_enabled() 



Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent f55abc0f

fs/ext3/super.c

+4 −8
Original line number Diff line number Diff line
@@ -1035,8 +1035,7 @@ static int parse_options (char *options, struct super_block *sb, 
		case Opt_grpjquota:

			qtype = GRPQUOTA;

set_qf_name:

			if ((sb_any_quota_enabled(sb) ||

			     sb_any_quota_suspended(sb)) &&

			if (sb_any_quota_loaded(sb) &&

			    !sbi->s_qf_names[qtype]) {

				printk(KERN_ERR

					"EXT3-fs: Cannot change journaled "
@@ -1075,8 +1074,7 @@ set_qf_name: 
		case Opt_offgrpjquota:

			qtype = GRPQUOTA;

clear_qf_name:

			if ((sb_any_quota_enabled(sb) ||

			     sb_any_quota_suspended(sb)) &&

			if (sb_any_quota_loaded(sb) &&

			    sbi->s_qf_names[qtype]) {

				printk(KERN_ERR "EXT3-fs: Cannot change "

					"journaled quota options when "
@@ -1095,8 +1093,7 @@ clear_qf_name: 
		case Opt_jqfmt_vfsv0:

			qfmt = QFMT_VFS_V0;

set_qf_format:

			if ((sb_any_quota_enabled(sb) ||

			     sb_any_quota_suspended(sb)) &&

			if (sb_any_quota_loaded(sb) &&

			    sbi->s_jquota_fmt != qfmt) {

				printk(KERN_ERR "EXT3-fs: Cannot change "

					"journaled quota options when "
@@ -1115,8 +1112,7 @@ set_qf_format: 
			set_opt(sbi->s_mount_opt, GRPQUOTA);

			break;

		case Opt_noquota:

			if (sb_any_quota_enabled(sb) ||

			    sb_any_quota_suspended(sb)) {

			if (sb_any_quota_loaded(sb)) {

				printk(KERN_ERR "EXT3-fs: Cannot change quota "

					"options when quota turned on.\n");

				return 0;