From 7127febc19054649cf0ca401090bb7b801847e7f Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Wed, 20 Aug 2008 18:14:35 +0200
Subject: [PATCH] --- yaml --- r: 125823 b: refs/heads/master c:
 17bd13b31ce4fe7f789d8848e8cbc8cb42b10544 h: refs/heads/master i:   125821:
 b5e7e47e2e7f5ee40f5daae77f1d5204ac1f7c86   125819:
 bdc1cbe3b8609f53a04112252b90d5ac58634d53   125815:
 98ac3245b1b1b6892dd75be0addc4136672945a3   125807:
 a41bf6834cd5bf5a381dafc7875d8792f31bc146   125791:
 849cec627b90ca8da4e50e79caa34284ef1c532b   125759:
 514de885ecbcf3d678d95e0ae560ac0731865ff5   125695:
 66381b6b47588931d24caa9be4d080c10f9143c1 v: v3

---
 [refs]                |  2 +-
 trunk/fs/ext4/super.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 2e253c32e86e..6f9c0e083293 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee0d5ffe0da2aa992004447113e28622621a983f
+refs/heads/master: 17bd13b31ce4fe7f789d8848e8cbc8cb42b10544
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 04158ad74dbb..49fcf8864e76 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -1142,8 +1142,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
 				       "EXT4-fs: Cannot change journaled "
@@ -1182,8 +1181,7 @@ static int parse_options(char *options, struct super_block *sb,
 		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 "EXT4-fs: Cannot change "
 					"journaled quota options when "
@@ -1202,8 +1200,7 @@ static int parse_options(char *options, struct super_block *sb,
 		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 "EXT4-fs: Cannot change "
 					"journaled quota options when "
@@ -1222,7 +1219,7 @@ static int parse_options(char *options, struct super_block *sb,
 			set_opt(sbi->s_mount_opt, GRPQUOTA);
 			break;
 		case Opt_noquota:
-			if (sb_any_quota_enabled(sb)) {
+			if (sb_any_quota_loaded(sb)) {
 				printk(KERN_ERR "EXT4-fs: Cannot change quota "
 					"options when quota turned on.\n");
 				return 0;