Added a patch to fix data loss issues of 2.6.9-rc1-mm1

4 files changed, 51 insertions, 4 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index cd2e53d85ff2..6e195330e042 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.179 2004/08/26 13:40:16 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.180 2004/08/31 02:30:56 scox Exp $
 
 *mm-sources-2.6.9_rc1-r1 (26 Aug 2004)
 
+  31 Aug 2004; Andrea Luzzardi <scox@gentoo.org>
+  +files/2.6.9_rc1-dataloss-fix.patch:
+  Added a patch to fix the data loss problem of this patchset
+  as described in http://lkml.org/lkml/2004/8/27/98.
+  Changed the ebuild to make it apply this patch.
+  
   26 Aug 2004; Brandon Low <lostlogic@gentoo.org>
   +mm-sources-2.6.9_rc1-r1.ebuild:
   Bump
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index a0ff6897133e..070a8e6b84e9 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -2,10 +2,10 @@ MD5 90e389dfabb2dcc99906d9ba975f2e63 mm-sources-2.6.8.1-r4.ebuild 1037
 MD5 11957950a39b91dc3be920deb9816ecb mm-sources-2.6.8.1-r1.ebuild 1030
 MD5 531503da042826456160a7d1e4ea2e92 mm-sources-2.6.8_rc3-r2.ebuild 1032
 MD5 5a21c80d4753a9c7adedbeb601f46f74 mm-sources-2.6.8.1-r3.ebuild 1030
-MD5 d3d14d5e88694086d2ac08b6a91babae mm-sources-2.6.9_rc1-r1.ebuild 1032
+MD5 79a792248bcb3d1756f92b0dc7b383d6 mm-sources-2.6.9_rc1-r1.ebuild 1114
 MD5 b7315219b6abeddce058837b8b4623b2 mm-sources-2.6.8_rc4-r1.ebuild 1032
 MD5 f60095efbeb9a6accd79534528d1428a mm-sources-2.6.8_rc2-r2.ebuild 1032
-MD5 8d7d8f779decde20526d95b53a281027 ChangeLog 32571
+MD5 3e3989bfb8c466d9f03807fdfd4928bd ChangeLog 32822
 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351
 MD5 6819376ae97a1abdc6ef01fdff5cd0c0 mm-sources-2.6.8.1-r2.ebuild 1037
 MD5 812838ab709c242375e4e868565d5b85 files/digest-mm-sources-2.6.8_rc2-r2 194
@@ -15,4 +15,5 @@ MD5 8f7c509f134123a961b795d9dd04bb0c files/digest-mm-sources-2.6.8.1-r1 129
 MD5 68b1e3f61278657cf08bf16e49f9c86f files/digest-mm-sources-2.6.8.1-r2 129
 MD5 5634179d6b21d2206d22dc236d41111e files/digest-mm-sources-2.6.8.1-r3 129
 MD5 a6828d9ad3e30e130fd4304ea82e1291 files/digest-mm-sources-2.6.8.1-r4 129
+MD5 587a3239ffa2d03c89abf3c3cb443d20 files/2.6.9_rc1-dataloss-fix.patch 1053
 MD5 ce22480da49a7425211c45e3415d5892 files/digest-mm-sources-2.6.9_rc1-r1 193
diff --git a/sys-kernel/mm-sources/files/2.6.9_rc1-dataloss-fix.patch b/sys-kernel/mm-sources/files/2.6.9_rc1-dataloss-fix.patch
new file mode 100644
index 000000000000..9593e6d6a2e4
--- /dev/null
+++ b/sys-kernel/mm-sources/files/2.6.9_rc1-dataloss-fix.patch
@@ -0,0 +1,37 @@
+--- 2.6.9-rc1-mm1/mm/filemap.c	2004-08-26 12:09:50.000000000 +0100
++++ linux/mm/filemap.c	2004-08-27 14:35:32.113359872 +0100
+@@ -722,10 +722,7 @@ void do_generic_mapping_read(struct addr
+ 	offset = *ppos & ~PAGE_CACHE_MASK;
+ 
+ 	isize = i_size_read(inode);
+-	if (!isize)
+-		goto out;
+-
+-	end_index = (isize - 1) >> PAGE_CACHE_SHIFT;
++	end_index = isize >> PAGE_CACHE_SHIFT;
+ 
+ 	for (;;) {
+ 		struct page *page;
+@@ -733,6 +730,11 @@ void do_generic_mapping_read(struct addr
+ 
+ 		if (index > end_index)
+ 			goto out;
++		if (index == end_index) {
++			nr = isize & ~PAGE_CACHE_MASK;
++			if (nr <= offset)
++				goto out;
++		}
+ 
+ 		cond_resched();
+ 		page_cache_readahead(mapping, &ra, filp, index);
+@@ -831,8 +833,8 @@ readpage:
+ 		 * another truncate extends the file - this is desired though).
+ 		 */
+ 		isize = i_size_read(inode);
+-		end_index = (isize - 1) >> PAGE_CACHE_SHIFT;
+-		if (unlikely(!isize || index > end_index)) {
++		end_index = isize >> PAGE_CACHE_SHIFT;
++		if (unlikely(index > end_index)) {
+ 			page_cache_release(page);
+ 			goto out;
+ 		}
\ No newline at end of file
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.9_rc1-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.9_rc1-r1.ebuild
index a1c2023e1fed..b4f75705693b 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.9_rc1-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.9_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.9_rc1-r1.ebuild,v 1.2 2004/08/27 19:57:47 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.9_rc1-r1.ebuild,v 1.3 2004/08/31 02:30:56 scox Exp $
 
 UNIPATCH_LIST="${DISTDIR}/${KV}.bz2"
 K_PREPATCHED="yes"
@@ -9,6 +9,9 @@ UNIPATCH_STRICTORDER="yes"
 ETYPE="sources"
 inherit kernel-2
 detect_version
+
+UNIPATCH_LIST="${DISTDIR}/${KV}.bz2 ${FILESDIR}/2.6.9_rc1-dataloss-fix.patch"
+
 K_NOSETEXTRAVERSION="don't_set_it"
 RESTRICT="nomirror"
 DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"