[Pkg-lustre-svn-commit] updated: [83f386c] LDISKFS kernel patchset adapted

[Marco Nelles]

The following commit has been merged in the master branch:
commit 83f386cba7ccca9d624f3efd49d22e9a894f35f5
Author: Marco Nelles <marco.nelles at credativ.de>
Date:   Thu Jul 5 13:01:52 2012 +0200

    LDISKFS kernel patchset adapted

diff --git a/debian/patches/ldiskfs-kernel-patchset.patch b/debian/patches/ldiskfs-kernel-patchset.patch
index 8757d8c..80c1f9c 100644
--- a/debian/patches/ldiskfs-kernel-patchset.patch
+++ b/debian/patches/ldiskfs-kernel-patchset.patch
@@ -463,14 +463,14 @@ index 0000000..8046e8b
 + 	ea_idebug(inode, "looking for cached blocks [%x]", (int)hash);
 diff --git a/ldiskfs/kernel_patches/patches/ext4-dynlocks-common-2.6.32-vanilla.patch b/ldiskfs/kernel_patches/patches/ext4-dynlocks-common-2.6.32-vanilla.patch
 new file mode 100644
-index 0000000..4a5f900
+index 0000000..cec1759
 --- /dev/null
 +++ b/ldiskfs/kernel_patches/patches/ext4-dynlocks-common-2.6.32-vanilla.patch
-@@ -0,0 +1,332 @@
+@@ -0,0 +1,355 @@
 +Index: linux-source-2.6.32/fs/ext4/dynlocks.c
 +===================================================================
 +--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-++++ linux-source-2.6.32/fs/ext4/dynlocks.c	2012-07-04 11:14:45.633371140 +0200
+++++ linux-source-2.6.32/fs/ext4/dynlocks.c	2012-07-05 12:59:58.978707058 +0200
 +@@ -0,0 +1,236 @@
 ++/*
 ++ * Dynamic Locks
@@ -711,7 +711,7 @@ index 0000000..4a5f900
 +Index: linux-source-2.6.32/include/linux/dynlocks.h
 +===================================================================
 +--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-++++ linux-source-2.6.32/include/linux/dynlocks.h	2012-07-04 11:14:45.637376168 +0200
+++++ linux-source-2.6.32/include/linux/dynlocks.h	2012-07-05 12:59:58.978707058 +0200
 +@@ -0,0 +1,34 @@
 ++#ifndef _LINUX_DYNLOCKS_H
 ++#define _LINUX_DYNLOCKS_H
@@ -749,8 +749,8 @@ index 0000000..4a5f900
 ++
 +Index: linux-source-2.6.32/fs/ext4/Makefile
 +===================================================================
-+--- linux-source-2.6.32.orig/fs/ext4/Makefile	2012-07-03 16:27:38.000000000 +0200
-++++ linux-source-2.6.32/fs/ext4/Makefile	2012-07-04 11:14:45.637376168 +0200
++--- linux-source-2.6.32.orig/fs/ext4/Makefile	2012-07-05 12:53:35.000000000 +0200
+++++ linux-source-2.6.32/fs/ext4/Makefile	2012-07-05 12:59:58.978707058 +0200
 +@@ -7,7 +7,7 @@
 + ext4-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
 + 		ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \
@@ -762,8 +762,8 @@ index 0000000..4a5f900
 + ext4-$(CONFIG_EXT4_FS_POSIX_ACL)	+= acl.o
 +Index: linux-source-2.6.32/fs/ext4/super.c
 +===================================================================
-+--- linux-source-2.6.32.orig/fs/ext4/super.c	2012-07-04 11:11:46.000000000 +0200
-++++ linux-source-2.6.32/fs/ext4/super.c	2012-07-04 11:14:45.637376168 +0200
++--- linux-source-2.6.32.orig/fs/ext4/super.c	2012-07-05 12:53:42.000000000 +0200
+++++ linux-source-2.6.32/fs/ext4/super.c	2012-07-05 12:59:58.978707058 +0200
 +@@ -4131,20 +4131,23 @@
 + 		return err;
 + 	ext4_kset = kset_create_and_add("ext4", NULL, fs_kobj);
@@ -791,7 +791,30 @@ index 0000000..4a5f900
 + 		goto out1;
 + 	err = register_filesystem(&ext4_fs_type);
 + 	if (err)
-+@@ -4171,6 +4174,7 @@
++@@ -4154,16 +4157,18 @@
++ 	mutex_init(&ext4_li_mtx);
++ 	return 0;
++ out:
++-	destroy_inodecache();
+++	dynlock_cache_exit();
++ out1:
++-	exit_ext4_xattr();
+++	destroy_inodecache();
++ out2:
++-	exit_ext4_mballoc();
+++	exit_ext4_xattr();
++ out3:
+++	exit_ext4_mballoc();
+++out4:
++ 	ext4_exit_feat_adverts();
++ 	remove_proc_entry("fs/ext4", NULL);
++ 	kset_unregister(ext4_kset);
++-out4:
+++out5:
++ 	exit_ext4_system_zone();
++ 	return err;
++ }
++@@ -4171,6 +4176,7 @@
 + static void __exit exit_ext4_fs(void)
 + {
 + 	unregister_filesystem(&ext4_fs_type);

-- 
Lustre Debian Packaging