Version bump, with upstream reiser4 patch.

Package-Manager: portage-2.0.51.21

5 files changed, 100 insertions, 11 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index bf863dcc8ef6..0a8a3dd03dd4 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.226 2005/05/05 22:06:43 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.227 2005/05/14 17:43:40 chainsaw Exp $
+
+*mm-sources-2.6.12_rc4-r1 (14 May 2005)
+
+  14 May 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/2.6.12-rc4-mm1-reiser4-breakage.patch,
+  +mm-sources-2.6.12_rc4-r1.ebuild:
+  Version bump, with upstream patch to avoid reiser4 breakage.
 
   05 May 2005; Tony Vroon <chainsaw@gentoo.org> :
   Rebuild horked manifest file.
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index cedd9fcd8b14..75e49a0cf30c 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -3,27 +3,30 @@ Hash: SHA1
 
 MD5 cac9c1545aeb6c06fd7fbbbb6dc097e3 mm-sources-2.6.11-r4.ebuild 1012
 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351
-MD5 fcb89ea31be89669e2daf6144637c1e1 ChangeLog 40333
-MD5 97799fe086349f56393f93ec2d78547f mm-sources-2.6.12_rc3-r1.ebuild 1064
-MD5 c16e03354988e1e3c446820b14192322 mm-sources-2.6.12_rc3-r2.ebuild 1016
+MD5 0d6fbf5fdde211017092b8ae1b39bd21 ChangeLog 40570
 MD5 5b9bbc92fd9dce88ff3369ff203bbf5a mm-sources-2.6.12_rc2-r1.ebuild 1017
 MD5 ddff9dc90892423dec4e6d8e3b34fe2c mm-sources-2.6.11-r3.ebuild 1012
 MD5 8ede9980fafb35fd21413b66a6b9db88 mm-sources-2.6.11-r2.ebuild 1013
 MD5 41156f8a367a3168cc945d2fb292d381 mm-sources-2.6.12_rc2-r3.ebuild 1017
+MD5 97799fe086349f56393f93ec2d78547f mm-sources-2.6.12_rc3-r1.ebuild 1064
+MD5 c16e03354988e1e3c446820b14192322 mm-sources-2.6.12_rc3-r2.ebuild 1016
 MD5 e076b18cfc9d1f466a7464560e978a9a mm-sources-2.6.12_rc3-r3.ebuild 1017
-MD5 344083e5d144f7ab98f91b682bb9b6fc files/digest-mm-sources-2.6.12_rc3-r1 197
+MD5 cc8f8c52d467b5a246f959bede3ac697 mm-sources-2.6.12_rc4-r1.ebuild 1062
 MD5 1efcf2745c51b350d3d99d6d0d9f22ec files/digest-mm-sources-2.6.11-r3 127
 MD5 45444c176e9e9224a66be0ff5055d9b7 files/digest-mm-sources-2.6.11-r4 127
 MD5 352b87022e85a81108ad35f34203550b files/digest-mm-sources-2.6.11-r2 127
 MD5 7427d158ef757af85d04be602905d73d files/digest-mm-sources-2.6.12_rc2-r3 197
-MD5 b8382b71b7b17387b168843efc9b469d files/digest-mm-sources-2.6.12_rc3-r3 197
-MD5 67cea821b4ac0f0cebede85e390377f2 files/digest-mm-sources-2.6.12_rc3-r2 197
 MD5 3b78dd930e187cb1fe6d50d4491987d2 files/digest-mm-sources-2.6.12_rc2-r1 197
 MD5 577afa6b9756ac464c781ff23727e92a files/2.6.12-rc3-mm1-uniprocessor-fixes.patch 2781
+MD5 344083e5d144f7ab98f91b682bb9b6fc files/digest-mm-sources-2.6.12_rc3-r1 197
+MD5 67cea821b4ac0f0cebede85e390377f2 files/digest-mm-sources-2.6.12_rc3-r2 197
+MD5 b8382b71b7b17387b168843efc9b469d files/digest-mm-sources-2.6.12_rc3-r3 197
+MD5 ab4feb194a239ec2da27b1515b015101 files/2.6.12-rc4-mm1-reiser4-breakage.patch 1688
+MD5 0bfebafd203f91c4a051b663a6b66f55 files/digest-mm-sources-2.6.12_rc4-r1 197
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCepjpp5vW4rUFj5oRAgpeAJ9jDlE7LnQAxw+6HOHgdjzmruxWIgCdHIdM
-56gjts1g1Bm/qAZLObkYVZk=
-=9dfT
+iD8DBQFChjk7p5vW4rUFj5oRAsE6AJ4jpW/atd9gfcxRrWh7g3Gjmu/r3ACeJCAu
+Tdcxf5AG6Gel1zYsJkZzcls=
+=5oYs
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/mm-sources/files/2.6.12-rc4-mm1-reiser4-breakage.patch b/sys-kernel/mm-sources/files/2.6.12-rc4-mm1-reiser4-breakage.patch
new file mode 100644
index 000000000000..2e4d8cf2289b
--- /dev/null
+++ b/sys-kernel/mm-sources/files/2.6.12-rc4-mm1-reiser4-breakage.patch
@@ -0,0 +1,52 @@
+diff -uNr linux-2.6.12-rc4-mm1.ORIG/fs/fs-writeback.c linux-2.6.12-rc4-mm1/fs/fs-writeback.c
+--- linux-2.6.12-rc4-mm1.ORIG/fs/fs-writeback.c	2005-05-14 18:31:04.000000000 +0100
++++ linux-2.6.12-rc4-mm1/fs/fs-writeback.c	2005-05-14 18:32:43.000000000 +0100
+@@ -283,6 +283,8 @@
+  * WB_SYNC_HOLD is a hack for sys_sync(): reattach the inode to sb->s_dirty so
+  * that it can be located for waiting on in __writeback_single_inode().
+  *
++ * Called under inode_lock.
++ *
+  * If `bdi' is non-zero then we're being asked to writeback a specific queue.
+  * This function assumes that the blockdev superblock's inodes are backed by
+  * a variety of queues, so all inodes are searched.  For other superblocks,
+@@ -303,8 +305,6 @@
+ {
+ 	const unsigned long start = jiffies;	/* livelock avoidance */
+ 
+-	spin_lock(&inode_lock);
+-
+ 	if (!wbc->for_kupdate || list_empty(&sb->s_io))
+ 		list_splice_init(&sb->s_dirty, &sb->s_io);
+ 
+@@ -384,7 +384,6 @@
+ 		if (wbc->nr_to_write <= 0)
+ 			break;
+ 	}
+-	spin_unlock(&inode_lock);
+ 	return;		/* Leave any unwritten inodes on s_io */
+ }
+ EXPORT_SYMBOL(generic_sync_sb_inodes);
+@@ -437,8 +436,11 @@
+ 			 * be unmounted by the time it is released.
+ 			 */
+ 			if (down_read_trylock(&sb->s_umount)) {
+-				if (sb->s_root)
++				if (sb->s_root) {
++					spin_lock(&inode_lock);
+ 					sync_sb_inodes(sb, wbc);
++					spin_unlock(&inode_lock);
++				}
+ 				up_read(&sb->s_umount);
+ 			}
+ 			spin_lock(&sb_lock);
+@@ -474,7 +476,9 @@
+ 			(inodes_stat.nr_inodes - inodes_stat.nr_unused) +
+ 			nr_dirty + nr_unstable;
+ 	wbc.nr_to_write += wbc.nr_to_write / 2;		/* Bit more for luck */
++	spin_lock(&inode_lock);
+ 	sync_sb_inodes(sb, &wbc);
++	spin_unlock(&inode_lock);
+ }
+ 
+ /*
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.12_rc4-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.12_rc4-r1
new file mode 100644
index 000000000000..15a771a84af5
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.12_rc4-r1
@@ -0,0 +1,3 @@
+MD5 6f13bede2cbd9b60c31807702e372099 patch-2.6.12-rc4.bz2 4273653
+MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
+MD5 7b4ad4f7308562af7710ed6132625d37 2.6.12-rc4-mm1.bz2 2536597
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.12_rc4-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.12_rc4-r1.ebuild
new file mode 100644
index 000000000000..70302e79f96e
--- /dev/null
+++ b/sys-kernel/mm-sources/mm-sources-2.6.12_rc4-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.12_rc4-r1.ebuild,v 1.1 2005/05/14 17:43:40 chainsaw Exp $
+
+K_PREPATCHED="yes"
+UNIPATCH_STRICTORDER="yes"
+
+ETYPE="sources"
+inherit kernel-2
+detect_version
+UNIPATCH_LIST="${DISTDIR}/${KV_FULL}.bz2 ${FILESDIR}/${KV_FULL}-reiser4-breakage.patch"
+K_NOSETEXTRAVERSION="don't_set_it"
+RESTRICT="nomirror"
+DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"
+SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/people/akpm/patches/2.6/${KV/-mm*/}/${KV}/${KV}.bz2"
+
+KEYWORDS="~x86 ~amd64 ~ia64 -* ~ppc"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching development-sources
+ebuild -- if the problem persists there, please file a bug at http://bugme.osdl.org.
+If the problem only occurs with mm-sources then please contact Andrew Morton to
+get your issue resolved."