Branch b1_8

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext4-version-2.6-rhel5.patch

diff --git a/ldiskfs/kernel_patches/patches/ext4-version-2.6-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-version-2.6-rhel5.patch
index cff9a12..fe9cfeb 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-version-2.6-rhel5.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-version-2.6-rhel5.patch
@@ -3,11 +3,16 @@ Index: linux-2.6.18-128.1.6/fs/ext4/super.c
 --- linux-2.6.18-128.1.6.orig/fs/ext4/super.c  2009-07-24 01:33:54.000000000 -0400
 +++ linux-2.6.18-128.1.6/fs/ext4/super.c       2009-07-24 01:35:28.000000000 -0400
 @@ -3461,6 +3461,8 @@ static int __init init_ext4_fs(void)
-       err = register_filesystem(&ext4dev_fs_type);
-       if (err)
                goto out;
+       }
+ #endif
 +
 +      printk(KERN_INFO "ldiskfs created from ""ext""4-2.6-rhel5\n");
        return 0;
  out:
        destroy_inodecache();
+--- /dev/null   2009-09-21 17:11:24.467285554 +0800
++++ linux-2.6.27.21-0.1/fs/ext4/fiemap.h
+@@ -0,0 +1,2 @@
++
++#include_next <fiemap.h>