summaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2014-09-16 22:23:10 +0200
committerJan Kara <jack@suse.cz>2014-10-22 09:02:48 +0200
commit7938db449bbc55bbeb164bec7af406212e7e98f1 (patch)
treeca9a2fe9fb37c8d6ddd2e31a8a6376b171b647c6 /fs/ext3
parentMerge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff)
downloadlinux-7938db449bbc55bbeb164bec7af406212e7e98f1.tar.xz
linux-7938db449bbc55bbeb164bec7af406212e7e98f1.zip
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>
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/super.c7
1 files changed, 0 insertions, 7 deletions
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;