rpms/kernel/devel linux-2.6-md-raid1-leak.patch, NONE, 1.1 kernel-2.6.spec, 1.2001, 1.2002

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7537

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-md-raid1-leak.patch 
Log Message:
fix raid1 leak


linux-2.6-md-raid1-leak.patch:
 raid1.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-md-raid1-leak.patch ---

Signed-off-by: Neil Brown <neilb at suse.de>

### Diffstat output
 ./drivers/md/raid1.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff ./drivers/md/raid1.c~current~ ./drivers/md/raid1.c
--- ./drivers/md/raid1.c~current~	2006-02-27 11:52:18.000000000 +1100
+++ ./drivers/md/raid1.c	2006-03-01 10:44:49.000000000 +1100
@@ -306,6 +306,7 @@ static int raid1_end_write_request(struc
 	r1bio_t * r1_bio = (r1bio_t *)(bio->bi_private);
 	int mirror, behind = test_bit(R1BIO_BehindIO, &r1_bio->state);
 	conf_t *conf = mddev_to_conf(r1_bio->mddev);
+	struct bio *to_put = NULL;
 
 	if (bio->bi_size)
 		return 1;
@@ -323,6 +324,7 @@ static int raid1_end_write_request(struc
 		 * this branch is our 'one mirror IO has finished' event handler:
 		 */
 		r1_bio->bios[mirror] = NULL;
+		to_put = bio;
 		if (!uptodate) {
 			md_error(r1_bio->mddev, conf->mirrors[mirror].rdev);
 			/* an I/O failed, we can't clear the bitmap */
@@ -375,7 +377,7 @@ static int raid1_end_write_request(struc
 			/* Don't dec_pending yet, we want to hold
 			 * the reference over the retry
 			 */
-			return 0;
+			goto out;
 		}
 		if (test_bit(R1BIO_BehindIO, &r1_bio->state)) {
 			/* free extra copy of the data pages */
@@ -392,10 +394,11 @@ static int raid1_end_write_request(struc
 		raid_end_bio_io(r1_bio);
 	}
 
-	if (r1_bio->bios[mirror]==NULL)
-		bio_put(bio);
-
 	rdev_dec_pending(conf->mirrors[mirror].rdev, conf->mddev);
+ out:
+	if (to_put)
+		bio_put(to_put);
+
 	return 0;
 }
 
@@ -857,7 +860,7 @@ static int make_request(request_queue_t 
 	atomic_set(&r1_bio->remaining, 0);
 	atomic_set(&r1_bio->behind_remaining, 0);
 
-	do_barriers = bio->bi_rw & BIO_RW_BARRIER;
+	do_barriers = bio_barrier(bio);
 	if (do_barriers)
 		set_bit(R1BIO_Barrier, &r1_bio->state);
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2001
retrieving revision 1.2002
diff -u -r1.2001 -r1.2002
--- kernel-2.6.spec	1 Mar 2006 19:15:24 -0000	1.2001
+++ kernel-2.6.spec	1 Mar 2006 20:07:16 -0000	1.2002
@@ -363,6 +363,7 @@
 Patch1690: linux-2.6-smsc-ircc2-pnp.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
 Patch1710: linux-2.6-sched-up-migration-cost.patch
+Patch1720: linux-2.6-md-raid1-leak.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
@@ -931,6 +932,8 @@
 %patch1700 -p1
 # Only print migration info on SMP
 %patch1710 -p1
+# Fix RAID1 leak
+%patch1720 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
@@ -1581,6 +1584,7 @@
 %changelog
 * Wed Mar  1 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5-git4
+- Fix leak in RAID1
 
 * Tue Feb 28 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5-git3