From adcb5c1168ec905b041bc0797aee91f576d8ebb9 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 18 Sep 2014 01:13:09 -0400 Subject: [PATCH] add patch dont-check-quota-format-when-there-are-no-quota-files --- ...heck-quota-format-when-there-are-no-quota-files | 42 ++++++++++++++++++++++ series | 1 + timestamps | 7 ++-- 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 dont-check-quota-format-when-there-are-no-quota-files diff --git a/dont-check-quota-format-when-there-are-no-quota-files b/dont-check-quota-format-when-there-are-no-quota-files new file mode 100644 index 00000000..4389c36c --- /dev/null +++ b/dont-check-quota-format-when-there-are-no-quota-files @@ -0,0 +1,42 @@ +ext4: don't check quota format when there are no quota files + +From: Jan Kara + +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 +Signed-off-by: Theodore Ts'o +--- + fs/ext4/super.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index 0b28b36e7915..3ff598f3d4af 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1712,13 +1712,6 @@ static int parse_options(char *options, struct super_block *sb, + "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)) { +-- +1.8.1.4 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-ext4" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + diff --git a/series b/series index 6669c6df..0d217f41 100644 --- a/series +++ b/series @@ -57,6 +57,7 @@ explicit-inform-user-about-orphan-list-cleanup avoid-pointless-scanning-of-checkpoint-lists simplify-calling-convention-around-jbd2_journal_clean_checkpoint_list +dont-check-quota-format-when-there-are-no-quota-files ########################################## # unstable patches diff --git a/timestamps b/timestamps index f87d596a..1ba5d06e 100755 --- a/timestamps +++ b/timestamps @@ -86,7 +86,8 @@ touch -d @1410893804 use-a-list-to-track-all-reclaimable-objects-for-extent-stat touch -d @1410893864 use-a-garbage-collection-algorithm-to-manage-object touch -d @1410893872 add-fallocate-mode-blocking-for-debugging touch -d @1411015336 avoid-pointless-scanning-of-checkpoint-lists -touch -d @1411016249 series touch -d @1411016292 simplify-calling-convention-around-jbd2_journal_clean_checkpoint_list -touch -d @1411016292 status -touch -d @1411016465 timestamps +touch -d @1411016944 series +touch -d @1411017135 dont-check-quota-format-when-there-are-no-quota-files +touch -d @1411017146 status +touch -d @1411017177 timestamps -- 2.11.4.GIT