aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2014-09-16 22:23:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-14 09:00:09 -0800
commit21078b62f5351d089e17b6e44cc064e900f020b4 (patch)
tree66a5de3f912ca63db4d3ffe3f48f4d7cf91f1787
parent70f08e0880b59a09b7320d3caa7788610c6a45ca (diff)
downloadlinux-yocto-21078b62f5351d089e17b6e44cc064e900f020b4.tar.gz
linux-yocto-21078b62f5351d089e17b6e44cc064e900f020b4.tar.bz2
linux-yocto-21078b62f5351d089e17b6e44cc064e900f020b4.zip
ext3: Don't check quota format when there are no quota files
commit 7938db449bbc55bbeb164bec7af406212e7e98f1 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 37fd31ed16e7..0498390f309e 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;