diff options
| author | Jan Kara <jack@suse.cz> | 2014-09-18 01:12:15 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 08:47:57 -0800 |
| commit | b69805f848234c9dd5ffd53d33d1bb264c91697e (patch) | |
| tree | 57d8e84cdd5b6c281776af9abff9ff10dcd154b0 /fs | |
| parent | cfcc2239096d692a3993b8462594b494da20eddf (diff) | |
| download | linux-3.10-b69805f848234c9dd5ffd53d33d1bb264c91697e.tar.gz linux-3.10-b69805f848234c9dd5ffd53d33d1bb264c91697e.tar.bz2 linux-3.10-b69805f848234c9dd5ffd53d33d1bb264c91697e.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/super.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 1fc14f7a08b..4a33907c3c8 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1632,13 +1632,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)) { |