aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2014-09-18 01:12:15 -0400
committerBen Hutchings <ben@decadent.org.uk>2014-12-14 16:23:42 +0000
commitcdf03cefa465ef3432eaadd64c5b21e13c8fd2ff (patch)
treed700d1b426c16aa4997c86e38b5b2eaa0257b432 /fs/ext4/super.c
parent3b795b7dcdec7c319ab9677bf070b40ee62198a0 (diff)
downloadkernel_samsung_smdk4412-cdf03cefa465ef3432eaadd64c5b21e13c8fd2ff.zip
kernel_samsung_smdk4412-cdf03cefa465ef3432eaadd64c5b21e13c8fd2ff.tar.gz
kernel_samsung_smdk4412-cdf03cefa465ef3432eaadd64c5b21e13c8fd2ff.tar.bz2
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/ext4/super.c')
-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 6581ee7..f897cb8 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1931,13 +1931,6 @@ set_qf_format:
"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)) {