Branch b1_8

b=19875
i=johann (patch from girish)
i=adilger

Disable delayed allocation since this is not robust in kernels prior to 2.6.31.

diff --git a/ldiskfs/kernel_patches/patches/ext4-disable-delalloc-sles11.patch b/ldiskfs/kernel_patches/patches/ext4-disable-delalloc-sles11.patch
new file mode 100644 (file)
index 0000000..c62b953
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/ext4-disable-delalloc-sles11.patch
@@ -0,0 +1,21 @@
+Disable the DELALLOC feature because it is not robust in ext4 versions < 2.6.31.
+
+--
+Index: linux-2.6.27.21-0.1/fs/ext4/super.c
+===================================================================
+--- linux-2.6.27.21-0.1.orig/fs/ext4/super.c   2009-06-15 05:36:44.000000000 -0400
++++ linux-2.6.27.21-0.1/fs/ext4/super.c        2009-06-15 05:40:38.000000000 -0400
+@@ -2462,13 +2462,6 @@ static int ext4_fill_super(struct super_
+                       "extents feature not enabled on this filesystem, "
+                       "use tune2fs.\n");
+ 
+-      /*
+-       * enable delayed allocation by default
+-       * Use -o nodelalloc to turn it off
+-       */
+-      set_opt(sbi->s_mount_opt, DELALLOC);
+-
+-
+       if (!parse_options((char *) data, sb, &journal_inum, &journal_devnum,
+                          NULL, 0))
+               goto failed_mount;

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
index 54e90e2..307047b 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series
@@ -20,3 +20,4 @@ ext4-ext_generation-sles11.patch
 ext4-remove-ioctl-filp-sles11.patch
 ext4-super-warning.patch
 ext4-alloc-policy-2.6-sles11.patch
+ext4-disable-delalloc-sles11.patch