b=20298 (Merge head ldiskfs and b1_8 ldiskfs)

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

diff --git a/ldiskfs/kernel_patches/patches/ext4-dynlocks-2.6-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-dynlocks-2.6-rhel5.patch
new file mode 100644 (file)
index 0000000..2a11baa
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/ext4-dynlocks-2.6-rhel5.patch
@@ -0,0 +1,32 @@
+diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/Makefile linux-2.6.27.21-0.1_2//fs/ext4/Makefile
+--- linux-2.6.27.21-0.1_1//fs/ext4/Makefile    2009-08-21 15:12:51.000000000 +0530
++++ linux-2.6.27.21-0.1_2//fs/ext4/Makefile    2009-08-21 15:13:23.000000000 +0530
+@@ -6,7 +6,7 @@ obj-$(CONFIG_EXT4DEV_FS) += ext4dev.o
+ 
+ ext4dev-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 \
+-                 ext4_jbd2.o migrate.o mballoc.o
++                 ext4_jbd2.o migrate.o mballoc.o dynlocks.o
+ 
+ ext4dev-$(CONFIG_EXT4DEV_FS_XATTR)    += xattr.o xattr_user.o xattr_trusted.o
+ ext4dev-$(CONFIG_EXT4DEV_FS_POSIX_ACL)        += acl.o
+diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/super.c linux-2.6.27.21-0.1_2//fs/ext4/super.c
+--- linux-2.6.27.21-0.1_1//fs/ext4/super.c     2009-08-21 15:12:51.000000000 +0530
++++ linux-2.6.27.21-0.1_2//fs/ext4/super.c     2009-08-21 15:18:18.000000000 +0530
+@@ -4126,6 +4126,7 @@ static int __init init_ext4_fs(void)
+       err = init_inodecache();
+       if (err)
+               goto out1;
++      dynlock_cache_init();
+       err = register_filesystem(&ext4_fs_type);
+       if (err)
+               goto out;
+@@ -4149,6 +4150,7 @@ static void __exit exit_ext4_fs(void)
+       unregister_filesystem(&ext4_fs_type);
+       unregister_filesystem(&ext4dev_fs_type);
+       destroy_inodecache();
++      dynlock_cache_exit();
+       exit_ext4_xattr();
+       exit_ext4_mballoc();
+       remove_proc_entry("fs/ext4", NULL);
+