Fixed wrong locking order.

Package-Manager: portage-2.1.4.4

4 files changed, 36 insertions, 8 deletions

diff --git a/sys-cluster/gfs-kernel/ChangeLog b/sys-cluster/gfs-kernel/ChangeLog
index 57732cf54bd0..4c95bb553b38 100644
--- a/sys-cluster/gfs-kernel/ChangeLog
+++ b/sys-cluster/gfs-kernel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/gfs-kernel
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.30 2008/03/21 02:21:04 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.31 2008/03/21 13:32:32 xmerlin Exp $
+
+  21 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/gfs-kernel-2.02.00-fix_wrong_locking_order.diff,
+  gfs-kernel-2.02.00.ebuild:
+  Fixed wrong locking order.
 
   21 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
   +files/gfs-kernel-2.02.00-before-2.6.23.diff,
diff --git a/sys-cluster/gfs-kernel/Manifest b/sys-cluster/gfs-kernel/Manifest
index 65dcef5a6b3e..55f77d113894 100644
--- a/sys-cluster/gfs-kernel/Manifest
+++ b/sys-cluster/gfs-kernel/Manifest
@@ -9,6 +9,7 @@ AUX gfs-kernel-1.04.00-post2.6.17-compilefix.patch 1449 RMD160 ad68ebc1853633a43
 AUX gfs-kernel-1.04.00-post2.6.22-compilefix.patch 1551 RMD160 1b4e7596ed6551475b2291a27377ee389d0e3972 SHA1 b1f4702f0fbe1497c73dcbaa280b92992ba1f6d0 SHA256 55cc92e258d592f177a3b361d1d2ed10d9c88013790ccfe700a3079425fb9e59
 AUX gfs-kernel-2.02.00-before-2.6.23.diff 9373 RMD160 ca5243b5d5ba1b545c7f746362f5c5dc2ed7d893 SHA1 51b9947475a146d6bd75048567264f807bb65466 SHA256 e6a4c40fc833293314c4771bf70ac1c9960ce7fe11fc1409a5ab6c346eeb4f6e
 AUX gfs-kernel-2.02.00-before-2.6.24.diff 5356 RMD160 cece71d13ec78d944a8ec1e4b85d3db787136093 SHA1 acee5735505f5a21cadd5276ea162c95c5c87428 SHA256 c7e00ba9008b572bdf07094d4638d216fc008f63b062f8010309db91f6263999
+AUX gfs-kernel-2.02.00-fix_wrong_locking_order.diff 493 RMD160 7b65e283dbac70bede70aa125c9d5a9151f0d7dd SHA1 5727e8d0f95ca910ff1dab20e8279969df3358ad SHA256 6db7a45bed943f941f5e5e66e67b209d46771bef5a18c9b1af7080c82c0b7aa6
 AUX gfs-kernel-locking-symbol.patch 509 RMD160 93c6631cf7fc4a5e8eb1844a0f6303a2c580e82a SHA1 2938621d4cfaef5ca2c1b921d82cdb3cf03d5bcb SHA256 d09edd37081aaf72b453f6020e00eb4b6e036e6e9b88ef6e22f84d00b98018ff
 DIST cluster-1.02.00.tar.gz 1356451 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269dc5 SHA1 d74cadb1ef21d1cfda333b20d7ef20272e0002d6 SHA256 de45885146f1481808f7a34af5e6b7e2042895a4e3844eaa6161f942345c7849
 DIST cluster-1.03.00.tar.gz 1658274 RMD160 6fc16e2edba73dd1a83ecfad749b1553eca6d938 SHA1 c205d8ec034433c33f26724f7f69b0028d2a63d4 SHA256 e61c2438c7ee8d546aec9dd86ee1851c9a71f127c25ad1fb0c59eb4ed534e97b
@@ -21,13 +22,13 @@ EBUILD gfs-kernel-1.02.00-r2.ebuild 2204 RMD160 8a707a0dbbf30a44ce7df976a03db3d1
 EBUILD gfs-kernel-1.03.00-r1.ebuild 1660 RMD160 1ed1ce627377fbdc217b2d4c5da862e3aac9f574 SHA1 a5377842ca31b48248f1ee661a5b58acd4917c50 SHA256 31955d70d6ef653675ec5ce2a69761fb948ceec9276de35fee4d4514a1a33fe9
 EBUILD gfs-kernel-1.04.00-r1.ebuild 1823 RMD160 6682ebf5232729eb6850a571ee301c7054cff8cd SHA1 a1da94b2b475f384931d01e7a1325ebb9e2d1ec2 SHA256 f3074d673bcbd8e92fb35b6308267eb2a1bb54ccc24804168d122a8809e75297
 EBUILD gfs-kernel-1.04.00.ebuild 1609 RMD160 4472e8300c46a0c8d95049ea17cc5ca03b82135d SHA1 1b14bdf031f0f0b338e4dcea810ca696d264ba76 SHA256 7ebef36abde617cf0a70ea2817f66c1495e79e811ebad3362b0311e5ffc57e63
-EBUILD gfs-kernel-2.02.00.ebuild 1974 RMD160 a9e88bc988d6d24bc9a5ed1c5a05e33bb278bde6 SHA1 c4ec1e0f0a439361cfbe02a025db159ac52a2a9e SHA256 ce83b4091ba5089369eb3b5bca4def6e64e50e47e1a203979d4cbb0fd9ac6455
-MISC ChangeLog 5431 RMD160 1f08d1be26a58b8036364daeecec2072abea0ae0 SHA1 e8382162ed47e50fdb41d6e93ff5fc9933370acc SHA256 1a30038aa823185255957d0625866e0028136211a18a2deccd7b1320abeb6e8f
+EBUILD gfs-kernel-2.02.00.ebuild 2038 RMD160 95549bbbfa340de067cd81e526360b718f598351 SHA1 2360e11f51aa4d9ee8e2fe197fb45817d1e1f14a SHA256 08e0b5daef2080ffd34fa231ae860e35df3a7349e2dfccfde632b02b4819dfd7
+MISC ChangeLog 5602 RMD160 877b7e9cab5899d896aff21111223739d771844e SHA1 f3372f11523ea46ea54e79d7b59bb286c2a542ae SHA256 c67c92a8f2f6290c931e43648da0bb9ae4b34922c7fa3e47993060787a923b1c
 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH4xuagMUyd/cdjWsRAnPnAKCOcQxxbG1212ppzqU4OPOkGBRrdwCdHh8l
-+FVjokK/lszVzVrfxj/F2cg=
-=zZN/
+iD8DBQFH47j4gMUyd/cdjWsRAkCBAJ9NTjnOnJy8JRoYNgFOQRw46ownJQCgjUJ4
+DGl4iHVMQS6S9/fR0raqroA=
+=0ISl
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-fix_wrong_locking_order.diff b/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-fix_wrong_locking_order.diff
new file mode 100644
index 000000000000..c96663d29b92
--- /dev/null
+++ b/sys-cluster/gfs-kernel/files/gfs-kernel-2.02.00-fix_wrong_locking_order.diff
@@ -0,0 +1,20 @@
+--- cluster-2.02.00/gfs-kernel/src/gfs/ops_inode.c.old	2008-03-21 11:44:44.000000000 +0000
++++ cluster-2.02.00/gfs-kernel/src/gfs/ops_inode.c	2008-03-21 11:45:08.000000000 +0000
+@@ -150,14 +150,14 @@
+ 	inode = gfs_iget(ip, CREATE);
+ 	gfs_inode_put(ip);
+ 
++	gfs_glock_dq_uninit(&d_gh);
++	gfs_glock_dq_uninit(&i_gh);
++
+ 	if (!inode)
+ 		error = -ENOMEM;
+ 	else
+ 		error = gfs_security_init(dip, ip);
+ 
+-	gfs_glock_dq_uninit(&d_gh);
+-	gfs_glock_dq_uninit(&i_gh);
+-
+ 	if (error)
+ 		return error;
+ 
diff --git a/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild
index 9bcf3dea424c..44f3c4f70618 100644
--- a/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild
+++ b/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild,v 1.2 2008/03/21 02:21:04 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-2.02.00.ebuild,v 1.3 2008/03/21 13:32:32 xmerlin Exp $
 
 inherit eutils linux-mod linux-info versionator
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
-DEPEND="=virtual/linux-sources-2.6.24*"
+DEPEND=">=virtual/linux-sources-2.6.20"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}/${PN}"
@@ -44,6 +44,8 @@ src_unpack() {
 			epatch "${FILESDIR}"/${P}-before-2.6.23.diff || die
 		fi
 	fi
+
+	epatch "${FILESDIR}"/${P}-fix_wrong_locking_order.diff || die
 }
 
 src_compile() {