LU-2337 scripts: init script to not use -d with zpool import

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext4-disable-delalloc-rhel5.patch

diff --git a/ldiskfs/kernel_patches/patches/ext4-disable-delalloc-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-disable-delalloc-rhel5.patch
index 8bbb947..912b52c 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-disable-delalloc-rhel5.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-disable-delalloc-rhel5.patch
@@ -4,7 +4,7 @@ Disable the DELALLOC feature because it is not robust in ext4 versions < 2.6.31.
 diff -rupN linux-2.6.18-164.6.1_1/fs/ext4/super.c linux-2.6.18-164.6.1_2/fs/ext4/super.c
 --- linux-2.6.18-164.6.1_1/fs/ext4/super.c     2010-08-05 13:44:07.000000000 +0530
 +++ linux-2.6.18-164.6.1_2/fs/ext4/super.c     2010-08-05 13:46:29.000000000 +0530
-@@ -2091,13 +2091,6 @@ static int ext4_fill_super(struct super_
+@@ -2091,12 +2091,6 @@ static int ext4_fill_super(struct super_
  
        set_opt(sbi->s_mount_opt, BARRIER);
  
@@ -14,7 +14,6 @@ diff -rupN linux-2.6.18-164.6.1_1/fs/ext4/super.c linux-2.6.18-164.6.1_2/fs/ext4
 -       */
 -      set_opt(sbi->s_mount_opt, DELALLOC);
 -
--
-       if (!parse_options((char *) data, sb, &journal_devnum,
+       if (!parse_options((char *) data, sb, &journal_devnum,
                           &journal_ioprio, NULL, 0))
                goto failed_mount;