From: Jan Kara <jack@suse.cz>
Date: Tue, 16 Sep 2014 20:23:10 +0000 (+0200)
Subject: ext3: Don't check quota format when there are no quota files
X-Git-Tag: v3.18-rc3~16^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7938db449bbc55bbeb164bec7af406212e7e98f1;p=karo-tx-linux.git

ext3: Don't check quota format when there are no quota files

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.

CC: stable@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
---

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 7015db0bafd1..eb742d0e67ff 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1354,13 +1354,6 @@ set_qf_format:
 					"not specified.");
 			return 0;
 		}
-	} else {
-		if (sbi->s_jquota_fmt) {
-			ext3_msg(sb, KERN_ERR, "error: journaled quota format "
-					"specified with no journaling "
-					"enabled.");
-			return 0;
-		}
 	}
 #endif
 	return 1;