aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2008-01-28 23:58:26 -0500
committerTheodore Ts'o <tytso@mit.edu>2008-01-28 23:58:26 -0500
commit3dbd0ede4d5320bd4c3cb914fec0595135b6d9a1 (patch)
tree4b985bdd423deaea51688857320c1a53a4e61999 /fs
parentc9de560ded61faa5b754137b7753da252391c55a (diff)
ext4: Enable the multiblock allocator by default
Enable the multiblock allocator by default. Fix ext4_show_options() so if it is not enabled, the nomballoc option included in /proc/mounts. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Acked-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/super.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 3a51ffc47790..b60c34038bb8 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -736,6 +736,8 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
736 seq_puts(seq, ",nobh"); 736 seq_puts(seq, ",nobh");
737 if (!test_opt(sb, EXTENTS)) 737 if (!test_opt(sb, EXTENTS))
738 seq_puts(seq, ",noextents"); 738 seq_puts(seq, ",noextents");
739 if (!test_opt(sb, MBALLOC))
740 seq_puts(seq, ",nomballoc");
739 if (test_opt(sb, I_VERSION)) 741 if (test_opt(sb, I_VERSION))
740 seq_puts(seq, ",i_version"); 742 seq_puts(seq, ",i_version");
741 743
@@ -1903,6 +1905,11 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
1903 * User -o noextents to turn it off 1905 * User -o noextents to turn it off
1904 */ 1906 */
1905 set_opt(sbi->s_mount_opt, EXTENTS); 1907 set_opt(sbi->s_mount_opt, EXTENTS);
1908 /*
1909 * turn on mballoc feature by default in ext4 filesystem
1910 * User -o nomballoc to turn it off
1911 */
1912 set_opt(sbi->s_mount_opt, MBALLOC);
1906 1913
1907 if (!parse_options ((char *) data, sb, &journal_inum, &journal_devnum, 1914 if (!parse_options ((char *) data, sb, &journal_inum, &journal_devnum,
1908 NULL, 0)) 1915 NULL, 0))