[kernel] r8248 - in dists/sid/linux-2.6/debian: . patches/bugfix patches/series

[Dann Frazier]

Author: dannf
Date: Tue Jan 30 23:28:10 2007
New Revision: 8248

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/raid1-repair-fix.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/10
Log:
* Fix raid1 recovery (closes: #406181)

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Jan 30 23:28:10 2007
@@ -1,5 +1,6 @@
 linux-2.6 (2.6.18.dfsg.1-10) UNRELEASED; urgency=low
 
+  [ maximilian attems ]
   * Add patches out of stable queue 2.6.18
     - [amd64] Don't leak NT bit into next task (CVE-2006-5755)
     - IB/srp: Fix FMR mapping for 32-bit kernels and addresses above 4G
@@ -36,7 +37,10 @@
   * [IDE] Add driver for Jmicron  JMB36x devices by Alan Cox.
     Enable jmicron on i386 and amd64 archs.
 
- -- maximilian attems <maks at sternwelten.at>  Mon, 29 Jan 2007 16:04:36 +0100
+  [ dann frazier ]
+  * Fix raid1 recovery (closes: #406181)
+
+ -- dann frazier <dannf at debian.org>  Tue, 30 Jan 2007 15:16:28 -0700
 
 linux-2.6 (2.6.18.dfsg.1-9) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/raid1-repair-fix.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/raid1-repair-fix.patch	Tue Jan 30 23:28:10 2007
@@ -0,0 +1,33 @@
+From: NeilBrown <neilb at suse.de>
+Date: Fri, 26 Jan 2007 08:57:01 +0000 (-0800)
+Subject: [PATCH] md: make 'repair' actually work for raid1
+X-Git-Url: http://www.kernel.org/git/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=3eda22d19b76b15ef3420b251bd47a0ba0127589
+
+[PATCH] md: make 'repair' actually work for raid1
+
+When 'repair' finds a block that is different one the various parts of the
+mirror.  it is meant to write a chosen good version to the others.  However it
+currently writes out the original data to each.  The memcpy to make all the
+data the same is missing.
+
+Signed-off-by: Neil Brown <neilb at suse.de>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+
+diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
+index 164b25d..ab74d40 100644
+--- a/drivers/md/raid1.c
++++ b/drivers/md/raid1.c
+@@ -1266,6 +1266,11 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
+ 					sbio->bi_sector = r1_bio->sector +
+ 						conf->mirrors[i].rdev->data_offset;
+ 					sbio->bi_bdev = conf->mirrors[i].rdev->bdev;
++					for (j = 0; j < vcnt ; j++)
++						memcpy(page_address(sbio->bi_io_vec[j].bv_page),
++						       page_address(pbio->bi_io_vec[j].bv_page),
++						       PAGE_SIZE);
++
+ 				}
+ 			}
+ 	}

Modified: dists/sid/linux-2.6/debian/patches/series/10
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/10	(original)
+++ dists/sid/linux-2.6/debian/patches/series/10	Tue Jan 30 23:28:10 2007
@@ -5,3 +5,4 @@
 + bugfix/2.6.16.38
 + bugfix/net-pkgtgen-kthread.patch
 + features/ide-jmicron.patch
++ bugfix/raid1-repair-fix.patch