summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2014-09-18 07:12:15 +0200
committerTheodore Ts'o <tytso@mit.edu>2014-09-18 07:12:15 +0200
commit279bf6d390933d5353ab298fcc306c391a961469 (patch)
treee86bd5549afad4cdbdd8f6fa61d9e1e828f162a6 /fs/ext4
parentjbd2: simplify calling convention around __jbd2_journal_clean_checkpoint_list (diff)
downloadlinux-279bf6d390933d5353ab298fcc306c391a961469.tar.xz
linux-279bf6d390933d5353ab298fcc306c391a961469.zip
ext4: 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> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/super.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 028935fc2760..115e27d855ef 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1712,13 +1712,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)) {