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)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 9 Aug 2013 03:01:24 +0000 (23:01 -0400)
commit59d9fa5c2e9086db11aa287bb4030151d0095a17
treee038a91f57fd56cfc6ba6e8c8d30b3c9c65935ec
parent44fb851dfb2f8e3462617e19a7b3b9025db9d919
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
fs/ext4/super.c