[PATCH] ext4: Enable delalloc and mballoc by default.

["Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>]

This ensure we test the latest features more easily.
We need an option to clear delayed alloc feature.
Add nodealloc option.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 fs/ext4/super.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 62d7ec8..0c32dc8 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -872,7 +872,7 @@ enum {
 	Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
 	Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
 	Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
-	Opt_grpquota, Opt_extents, Opt_noextents, Opt_delalloc,
+	Opt_grpquota, Opt_extents, Opt_noextents, Opt_delalloc, Opt_nodelalloc,
 	Opt_mballoc, Opt_nomballoc, Opt_stripe,
 };
 
@@ -928,6 +928,7 @@ static match_table_t tokens = {
 	{Opt_extents, "extents"},
 	{Opt_noextents, "noextents"},
 	{Opt_delalloc, "delalloc"},
+	{Opt_nodelalloc, "nodelalloc"},
 	{Opt_mballoc, "mballoc"},
 	{Opt_nomballoc, "nomballoc"},
 	{Opt_stripe, "stripe=%u"},
@@ -1279,6 +1280,9 @@ clear_qf_name:
 		case Opt_delalloc:
 			set_opt (sbi->s_mount_opt, DELALLOC);
 			break;
+		case Opt_nodelalloc:
+			clear_opt (sbi->s_mount_opt, DELALLOC);
+			break;
 		case Opt_mballoc:
 			set_opt(sbi->s_mount_opt, MBALLOC);
 			break;
@@ -1824,6 +1828,8 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
 	 * User -o noextents to turn it off
 	 */
 	set_opt(sbi->s_mount_opt, EXTENTS);
+	set_opt(sbi->s_mount_opt, DELALLOC);
+	set_opt(sbi->s_mount_opt, MBALLOC);
 
 	if (!parse_options ((char *) data, sb, &journal_inum, &journal_devnum,
 			    NULL, 0))
-- 
1.5.3.4.319.gdd817-dirty