ext3: Don't check quota format when there are no quota files
authorJan Kara <jack@suse.cz>
Tue, 16 Sep 2014 20:23:10 +0000 (22:23 +0200)
committerJan Kara <jack@suse.cz>
Wed, 22 Oct 2014 07:02:48 +0000 (09:02 +0200)
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>
fs/ext3/super.c

index 7015db0..eb742d0 100644 (file)
@@ -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;