summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2014-09-18 01:12:15 -0400
committerJiri Slaby <jslaby@suse.cz>2014-11-13 19:02:33 +0100
commit0dce193f3456fe009fc3c588f4ac39f33446df61 (patch)
tree1da31fdc9697808f2b21dae3214f66428140f705 /fs
parent2d550cd1fcb6816e8f41c46f19802d57daa9762f (diff)
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs')
-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 b52a34bc7600..cf3068a50b48 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1687,13 +1687,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)) {