r1609 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Christoph Hellwig]

Author: hch-guest
Date: 2004-09-18 06:07:36 -0600 (Sat, 18 Sep 2004)
New Revision: 1609

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/copy_to_high_bio_irq-leak-fix.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7
Log:

  * Fix yet another bio leak (Christoph Hellwig).



Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-09-18 11:58:02 UTC (rev 1608)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-09-18 12:07:36 UTC (rev 1609)
@@ -4,6 +4,8 @@
 
   * Really enable i915 agpgart support (Christoph Hellwig).
 
+  * Fix yet another bio leak (Christoph Hellwig).
+
  -- Jens Schmalzing <jensen@debian.org>  Thu, 16 Sep 2004 10:04:54 +0200
 
 kernel-source-2.6.8 (2.6.8-6) unstable; urgency=medium

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/copy_to_high_bio_irq-leak-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/copy_to_high_bio_irq-leak-fix.dpatch	2004-09-18 11:58:02 UTC (rev 1608)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/copy_to_high_bio_irq-leak-fix.dpatch	2004-09-18 12:07:36 UTC (rev 1609)
@@ -0,0 +1,40 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Fix leak in copy_to_high_bio_irq
+## DP: Patch author: Jens Axboe <axboe@suse.de>
+## DP: Upstream status: backport
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- 1.51/mm/highmem.c	2004-07-29 06:58:32 +02:00
++++ edited/mm/highmem.c	2004-09-08 21:18:57 +02:00
+@@ -284,7 +284,7 @@
+ 	struct bio_vec *tovec, *fromvec;
+ 	int i;
+ 
+-	bio_for_each_segment(tovec, to, i) {
++	__bio_for_each_segment(tovec, to, i, 0) {
+ 		fromvec = from->bi_io_vec + i;
+ 
+ 		/*
+@@ -316,7 +316,7 @@
+ 	/*
+ 	 * free up bounce indirect pages used
+ 	 */
+-	bio_for_each_segment(bvec, bio, i) {
++	__bio_for_each_segment(bvec, bio, i, 0) {
+ 		org_vec = bio_orig->bi_io_vec + i;
+ 		if (bvec->bv_page == org_vec->bv_page)
+ 			continue;
+
+-- 
+Jens Axboe
+
+-
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7	2004-09-18 11:58:02 UTC (rev 1608)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7	2004-09-18 12:07:36 UTC (rev 1609)
@@ -1,2 +1,3 @@
 + ppc-boot-isa.dpatch
 + i915-agp.dpatch
++ copy_to_high_bio_irq-leak-fix.dpatch