diff options
author | Theodore Ts'o <tytso@mit.edu> | 2013-08-08 23:01:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-14 22:59:09 -0700 |
commit | 1929c51fc204bf84c5cbbd08861dd0a9da86b921 (patch) | |
tree | 1a62bae4a8e1f5a2c287b9fbc09f1cdaf4c60641 /fs | |
parent | ce512e58aa200513472a438e72a0fbe2bcaf8524 (diff) | |
download | linux-stable-1929c51fc204bf84c5cbbd08861dd0a9da86b921.tar.gz linux-stable-1929c51fc204bf84c5cbbd08861dd0a9da86b921.tar.bz2 linux-stable-1929c51fc204bf84c5cbbd08861dd0a9da86b921.zip |
ext4: allow the mount options nodelalloc and data=journal
commit 59d9fa5c2e9086db11aa287bb4030151d0095a17 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 2bf2f33107d0..3c2bf0c4c1e0 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1341,7 +1341,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 | |