ext4: allow the mount options nodelalloc and data=journal
authorTheodore Ts'o <tytso@mit.edu>
Fri, 9 Aug 2013 03:01:24 +0000 (23:01 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Aug 2013 05:59:09 +0000 (22:59 -0700)
commit1929c51fc204bf84c5cbbd08861dd0a9da86b921
tree1a62bae4a8e1f5a2c287b9fbc09f1cdaf4c60641
parentce512e58aa200513472a438e72a0fbe2bcaf8524
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>
fs/ext4/super.c