Whamcloud - gitweb
b=20298 (Merge head ldiskfs and b1_8 ldiskfs)
[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-dynlocks-2.6-rhel5.patch
1 diff -rupN linux-2.6.18-128.1.6_1/fs/ext3/Makefile linux-2.6.18-128.1.6_2/fs/ext3/Makefile
2 --- linux-2.6.18-128.1.6_1/fs/ext3/Makefile     2009-08-13 19:19:54.000000000 +0530
3 +++ linux-2.6.18-128.1.6_2/fs/ext3/Makefile     2009-08-13 19:20:30.000000000 +0530
4 @@ -5,7 +5,8 @@
5  obj-$(CONFIG_EXT3_FS) += ext3.o
6  
7  ext3-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
8 -          ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o mballoc.o
9 +          ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \
10 +          mballoc.o dynlocks.o
11  
12  ext3-$(CONFIG_EXT3_FS_XATTR)    += xattr.o xattr_user.o xattr_trusted.o
13  ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o
14 diff -rupN linux-2.6.18-128.1.6_1/fs/ext3/super.c linux-2.6.18-128.1.6_2/fs/ext3/super.c
15 --- linux-2.6.18-128.1.6_1/fs/ext3/super.c      2009-08-13 19:19:54.000000000 +0530
16 +++ linux-2.6.18-128.1.6_2/fs/ext3/super.c      2009-08-13 19:23:23.000000000 +0530
17 @@ -3529,6 +3530,7 @@ static int __init init_ext3_fs(void)
18         err = init_inodecache();
19         if (err)
20                 goto out1;
21 +       dynlock_cache_init();
22          err = register_filesystem(&ext3_fs_type);
23         if (err)
24                 goto out;
25 @@ -3546,6 +3548,7 @@ out1:
26  static void __exit exit_ext3_fs(void)
27  {
28         unregister_filesystem(&ext3_fs_type);
29 +       dynlock_cache_exit();
30         destroy_inodecache();
31         exit_ext3_xattr();
32         exit_ext3_proc();
33