dont-check-quota-format-when-there-are-no-quota-files

   1 ext4: don't check quota format when there are no quota files
   2
   3 From: Jan Kara <jack@suse.cz>
   4
   5 The check whether quota format is set even though there are no
   6 quota files with journalled quota is pointless and it actually
   7 makes it impossible to turn off journalled quotas (as there's
   8 no way to unset journalled quota format). Just remove the check.
   9
  10 CC: stable@vger.kernel.org
  11 Signed-off-by: Jan Kara <jack@suse.cz>
  12 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  13 ---
  14  fs/ext4/super.c | 7 -------
  15  1 file changed, 7 deletions(-)
  16
  17 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
  18 index 0b28b36e7915..3ff598f3d4af 100644
  19 --- a/fs/ext4/super.c
  20 +++ b/fs/ext4/super.c
  21 @@ -1712,13 +1712,6 @@ static int parse_options(char *options, struct super_block *sb,
  22                                         "not specified");
  23                         return 0;
  24                 }
  25 -       } else {
  26 -               if (sbi->s_jquota_fmt) {
  27 -                       ext4_msg(sb, KERN_ERR, "journaled quota format "
  28 -                                       "specified with no journaling "
  29 -                                       "enabled");
  30 -                       return 0;
  31 -               }
  32         }
  33  #endif
  34         if (test_opt(sb, DIOREAD_NOLOCK)) {
  35 --
  36 1.8.1.4
  37
  38 --
  39 To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
  40 the body of a message to majordomo@vger.kernel.org
  41 More majordomo info at  http://vger.kernel.org/majordomo-info.html
  42