b=20298 (Merge head ldiskfs and b1_8 ldiskfs)

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-mballoc3-sles10.patch

diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc3-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc3-sles10.patch
index 88be686..655e4bb 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mballoc3-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mballoc3-sles10.patch
@@ -243,16 +243,16 @@ Index: linux-2.6.16.46-0.14/fs/ext3/extents.c
        /* 
         * TODO: optimization is possible here
         * probably we need not scaning at all,
        /* 
         * TODO: optimization is possible here
         * probably we need not scaning at all,

-Index: linux-2.6.16.46-0.14/fs/ext3/Makefile
+Index: linux-2.6.18.8/fs/ext3/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.16.46-0.14.orig/fs/ext3/Makefile
-+++ linux-2.6.16.46-0.14/fs/ext3/Makefile
-@@ -6,7 +6,7 @@ obj-$(CONFIG_EXT3_FS) += ext3.o
+--- linux-2.6.18.8.orig/fs/ext3/Makefile
++++ linux-2.6.18.8/fs/ext3/Makefile
+@@ -5,7 +5,7 @@
+ obj-$(CONFIG_EXT3_FS) += ext3.o

  
  ext3-y        := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
  
  ext3-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 resize.o \
--         extents.o
-+         extents.o mballoc.o
+-         ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o
++         ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o mballoc.o

  
  ext3-$(CONFIG_EXT3_FS_XATTR)   += xattr.o xattr_user.o xattr_trusted.o
  ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o
  
  ext3-$(CONFIG_EXT3_FS_XATTR)   += xattr.o xattr_user.o xattr_trusted.o
  ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o