sem2mutex compile fix for 2.6.16, thanks to Patrizio Bassi in bug #119538

Package-Manager: portage-2.1_pre6-r6

4 files changed, 67 insertions, 17 deletions

diff --git a/sys-fs/submount/ChangeLog b/sys-fs/submount/ChangeLog
index f396041fc145..baa0b113d71c 100644
--- a/sys-fs/submount/ChangeLog
+++ b/sys-fs/submount/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/submount
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/submount/ChangeLog,v 1.18 2005/10/18 13:08:33 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/submount/ChangeLog,v 1.19 2006/03/25 13:49:49 dsd Exp $
+
+  25 Mar 2006; Daniel Drake <dsd@gentoo.org>
+  +files/submount-0.9-sem2mutex.patch, submount-0.9-r2.ebuild:
+  sem2mutex compile fix for 2.6.16, thanks to Patrizio Bassi in bug #119538
 
   18 Oct 2005; Aron Griffis <agriffis@gentoo.org> submount-0.9-r2.ebuild:
   Mark 0.9-r2 stable on alpha
diff --git a/sys-fs/submount/Manifest b/sys-fs/submount/Manifest
index 516464a7e3fe..18a6b79bcad0 100644
--- a/sys-fs/submount/Manifest
+++ b/sys-fs/submount/Manifest
@@ -1,14 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c3aedbfe00ee1a825a9d5760b4b4271e metadata.xml 316
-MD5 178701eb1ece3937618adfa48f8388a9 ChangeLog 2524
-MD5 131b60c69a3bbbdb61facd005cdd1df7 submount-0.9-r2.ebuild 1421
+MD5 b862b0d0a2049e3b476be353f90de8ad ChangeLog 2704
+RMD160 2e472168bdd7b9c06105f52c80a0203120d3b9db ChangeLog 2704
+SHA256 b038aa83d910735cdc0d345357898442b6bb43b401b11025bdb9bac935e8fe78 ChangeLog 2704
 MD5 f8a7a9ce45e2bebda73720c85f3307be files/digest-submount-0.9-r2 130
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDVPPmJrHF4yAQTrARAt7iAJ0UcSyPRpO07ApFzJurEjZdWoAY9QCguMIw
-qH0S1yeb2d1PDFuWMbS5BzQ=
-=QipX
------END PGP SIGNATURE-----
+RMD160 d5f02570095f59dbdc94a3e58eb496b08b785929 files/digest-submount-0.9-r2 130
+SHA256 a4a233a305349e466d99dd16fde5ff4fd43e571e6834101b8940d0a2179e3a48 files/digest-submount-0.9-r2 130
+MD5 ef98bc688f9dee82aae9db84f21542bd files/submount-0.9-sem2mutex.patch 1164
+RMD160 4af8161dc6eb5317e1f14845e506c9976e3e65bc files/submount-0.9-sem2mutex.patch 1164
+SHA256 ef4a24d39c95e0e6d474ebc9bce9741a9b3edc446e5d3ea9ba2874865955fd78 files/submount-0.9-sem2mutex.patch 1164
+MD5 c3aedbfe00ee1a825a9d5760b4b4271e metadata.xml 316
+RMD160 86959ebc67df5cee64e1e38ec6cfea594758f159 metadata.xml 316
+SHA256 8a664f34fa277b8d1fac76a63d41f63a0e6e8413d20962435c4990ff0f8a8f9f metadata.xml 316
+MD5 231dc5e22fa842f04374466774b0468b submount-0.9-r2.ebuild 1496
+RMD160 0c8bdbe5fa3620b02ec1c7ce8f7bc96dd1258f66 submount-0.9-r2.ebuild 1496
+SHA256 c34f68dadf005c293bd3b27cc1325eacc79eb50a61ec3ff9bc873c744508644a submount-0.9-r2.ebuild 1496
diff --git a/sys-fs/submount/files/submount-0.9-sem2mutex.patch b/sys-fs/submount/files/submount-0.9-sem2mutex.patch
new file mode 100644
index 000000000000..a40648c0f5f1
--- /dev/null
+++ b/sys-fs/submount/files/submount-0.9-sem2mutex.patch
@@ -0,0 +1,42 @@
+--- submount-0.9/subfs-0.9/subfs.c.orig	2006-03-22 10:06:33.000000000 +0100
++++ submount-0.9/subfs-0.9/subfs.c	2006-03-22 10:08:11.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include <asm/signal.h>
+ #include <linux/signal.h>
+ #include <linux/sched.h>
++#include <linux/version.h>
+ 
+ #include "subfs.h"
+ 
+@@ -221,14 +222,30 @@
+ 	struct vfsmount *child;
+ 
+ 	/* This is ugly, but prevents a lockup during mount. */
++
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
++	mutex_unlock(&dir->i_mutex);
++#else
+ 	up(&dir->i_sem);
++#endif
++
+ 	if (down_interruptible(&sfs_mnt->sem)) {
+-		down(&dir->i_sem);/*put the dir sem back down if interrupted*/
++
++# if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
++		mutex_lock(&dir->i_mutex); /*put the dir sem back down if interrupted*/
++#else
++		down(&dir->i_sem); /*put the dir sem back down if interrupted*/
++#endif
+ 		return ERR_PTR(-ERESTARTSYS);
+ 	}
+ 	child = get_child_mount(sfs_mnt);
+ 	up(&sfs_mnt->sem);
++
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
++	mutex_lock(&dir->i_mutex); /*put the dir sem back down if interrupted*/
++#else
+ 	down(&dir->i_sem);
++#endif
+ 	if (IS_ERR(child))
+ 		return (void *) child;
+ 	subfs_send_signal();
diff --git a/sys-fs/submount/submount-0.9-r2.ebuild b/sys-fs/submount/submount-0.9-r2.ebuild
index 1191d488177a..796f2caae497 100644
--- a/sys-fs/submount/submount-0.9-r2.ebuild
+++ b/sys-fs/submount/submount-0.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/submount/submount-0.9-r2.ebuild,v 1.6 2005/10/18 13:08:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/submount/submount-0.9-r2.ebuild,v 1.7 2006/03/25 13:49:49 dsd Exp $
 
 inherit linux-mod
 
@@ -37,6 +37,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	convert_to_m ${S}/subfs-${MY_PV}/Makefile
+
+	# Fix compile on 2.6.16, bug #119538
+	epatch ${FILESDIR}/${P}-sem2mutex.patch
 }
 
 src_compile() {