From: Jan Kara <jack@suse.cz>
Date: Thu, 18 Sep 2014 05:12:15 +0000 (-0400)
Subject: ext4: don't check quota format when there are no quota files
X-Git-Tag: v3.2.65~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdf03cefa465ef3432eaadd64c5b21e13c8fd2ff;p=thirdparty%2Fkernel%2Fstable.git

ext4: don't check quota format when there are no quota files

commit 279bf6d390933d5353ab298fcc306c391a961469 upstream.

The check whether quota format is set even though there are no
quota files with journalled quota is pointless and it actually
makes it impossible to turn off journalled quotas (as there's
no way to unset journalled quota format). Just remove the check.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 6581ee7731255..f897cb81c2628 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1931,13 +1931,6 @@ set_qf_format:
 					"not specified");
 			return 0;
 		}
-	} else {
-		if (sbi->s_jquota_fmt) {
-			ext4_msg(sb, KERN_ERR, "journaled quota format "
-					"specified with no journaling "
-					"enabled");
-			return 0;
-		}
 	}
 #endif
 	if (test_opt(sb, DIOREAD_NOLOCK)) {