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

commit 279bf6d 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 <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
raspberrypi · Nov 14, 2014 · 95fda60 · 95fda60
1 parent 8fc610f
commit 95fda60
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
@@ -1706,13 +1706,6 @@ static int parse_options(char *options, struct super_block *sb,
 					"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)) {