- landing of b_hd_cleanup_merge to HEAD.

[fs/lustre-release.git] / lustre / kernel_patches / patches / ext3-extents-in-ea-exports-symbol-2.6.7.patch

diff --git a/lustre/kernel_patches/patches/ext3-extents-in-ea-exports-symbol-2.4.21-suse2.patch b/lustre/kernel_patches/patches/ext3-extents-in-ea-exports-symbol-2.6.7.patch
old mode 100644 (file)
new mode 100755 (executable)
similarity index 64%
rename from lustre/kernel_patches/patches/ext3-extents-in-ea-exports-symbol-2.4.21-suse2.patch
rename to lustre/kernel_patches/patches/ext3-extents-in-ea-exports-symbol-2.6.7.patch
index 092abfb..c2ceb40
--- a/lustre/kernel_patches/patches/ext3-extents-in-ea-exports-symbol-2.4.21-suse2.patch
+++ b/lustre/kernel_patches/patches/ext3-extents-in-ea-exports-symbol-2.6.7.patch
@@ -1,7 +1,7 @@
-Index: linux-2.4.21-suse2/fs/ext3/extents-in-ea.c
+Index: linux-2.6.7/fs/ext3/extents-in-ea.c
 ===================================================================
---- linux-2.4.21-suse2.orig/fs/ext3/extents-in-ea.c    2004-08-19 16:45:44.000000000 +0400
-+++ linux-2.4.21-suse2/fs/ext3/extents-in-ea.c 2004-08-19 17:17:22.000000000 +0400
+--- linux-2.6.7.orig/fs/ext3/extents-in-ea.c   2004-08-13 08:58:28.000000000 +0800
++++ linux-2.6.7/fs/ext3/extents-in-ea.c        2004-08-13 08:58:34.000000000 +0800
 @@ -115,7 +115,7 @@
        kfree(root);
        return err;
@@ -29,7 +29,7 @@ Index: linux-2.4.21-suse2/fs/ext3/extents-in-ea.c
  int ext3_ext_in_ea_presence(struct inode *inode, int name_index,
                                const char *eaname, unsigned long block)
  {
-@@ -222,3 +222,49 @@
+@@ -331,3 +331,49 @@
        return err;
  }
  
@@ -79,37 +79,15 @@ Index: linux-2.4.21-suse2/fs/ext3/extents-in-ea.c
 +      return err;     
 +}
 +EXPORT_SYMBOL(ext3_ext_in_ea_get_extents_num);
-Index: linux-2.4.21-suse2/fs/ext3/Makefile
+Index: linux-2.6.7/fs/ext3/ioctl.c
 ===================================================================
---- linux-2.4.21-suse2.orig/fs/ext3/Makefile   2004-08-19 16:45:44.000000000 +0400
-+++ linux-2.4.21-suse2/fs/ext3/Makefile        2004-08-19 17:18:25.000000000 +0400
-@@ -13,13 +13,16 @@
- 
- obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
-               ioctl.o namei.o super.o symlink.o hash.o ext3-exports.o \
--              extents.o
-+              extents.o extents-in-ea.o
- export-objs += extents.o
- 
- obj-m    := $(O_TARGET)
- 
- export-objs += xattr.o
- obj-$(CONFIG_EXT3_FS_XATTR) += xattr.o extents-in-ea.o
-+ifeq ($(CONFIG_EXT3_FS_XATTR),y)
-+export-objs += extents-in-ea.o 
-+endif
- obj-$(CONFIG_EXT3_FS_XATTR_USER) += xattr_user.o
- obj-$(CONFIG_EXT3_FS_XATTR_TRUSTED) += xattr_trusted.o
- obj-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o
-Index: linux-2.4.21-suse2/fs/ext3/ioctl.c
-===================================================================
---- linux-2.4.21-suse2.orig/fs/ext3/ioctl.c    2004-08-19 13:51:49.000000000 +0400
-+++ linux-2.4.21-suse2/fs/ext3/ioctl.c 2004-08-19 17:17:22.000000000 +0400
+--- linux-2.6.7.orig/fs/ext3/ioctl.c   2004-08-13 08:58:28.000000000 +0800
++++ linux-2.6.7/fs/ext3/ioctl.c        2004-08-13 08:58:34.000000000 +0800
 @@ -11,6 +11,7 @@
  #include <linux/jbd.h>
  #include <linux/ext3_fs.h>
  #include <linux/ext3_jbd.h>
 +#include <linux/ext3_extents.h>
- #include <linux/sched.h>
+ #include <linux/time.h>
  #include <asm/uaccess.h>