aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2013-08-08 23:01:24 -0400
committerTheodore Ts'o <tytso@mit.edu>2013-08-08 23:01:24 -0400
commit59d9fa5c2e9086db11aa287bb4030151d0095a17 (patch)
treee038a91f57fd56cfc6ba6e8c8d30b3c9c65935ec /fs
parent44fb851dfb2f8e3462617e19a7b3b9025db9d919 (diff)
downloadkernel_goldelico_gta04-59d9fa5c2e9086db11aa287bb4030151d0095a17.zip
kernel_goldelico_gta04-59d9fa5c2e9086db11aa287bb4030151d0095a17.tar.gz
kernel_goldelico_gta04-59d9fa5c2e9086db11aa287bb4030151d0095a17.tar.bz2
ext4: allow the mount options nodelalloc and data=journal
Commit 26092bf ("ext4: use a table-driven handler for mount options") wrongly disallows the specifying the mount options nodelalloc and data=journal simultaneously. This is incorrect; it should have only disallowed the combination of delalloc and data=journal simultaneously. Reported-by: Piotr Sarna <p.sarna@partner.samsung.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: stable@vger.kernel.org
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 36b141e..75b3708 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1359,7 +1359,7 @@ static const struct mount_opts {
{Opt_delalloc, EXT4_MOUNT_DELALLOC,
MOPT_EXT4_ONLY | MOPT_SET | MOPT_EXPLICIT},
{Opt_nodelalloc, EXT4_MOUNT_DELALLOC,
- MOPT_EXT4_ONLY | MOPT_CLEAR | MOPT_EXPLICIT},
+ MOPT_EXT4_ONLY | MOPT_CLEAR},
{Opt_journal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,
MOPT_EXT4_ONLY | MOPT_SET},
{Opt_journal_async_commit, (EXT4_MOUNT_JOURNAL_ASYNC_COMMIT |