1 files changed, 61 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0017-md-raid10-fix-failure-when-trying-to-repair-a-read-e.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0017-md-raid10-fix-failure-when-trying-to-repair-a-read-e.patch
new file mode 100644
index 00000000..1f96efac
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.23/0017-md-raid10-fix-failure-when-trying-to-repair-a-read-e.patch
@@ -0,0 +1,61 @@
+From 4c1df6ee8b798576a23b25ab391cd7f3b5835bcd Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Tue, 3 Jul 2012 15:55:33 +1000
+Subject: [PATCH 17/49] md/raid10: fix failure when trying to repair a read
+ error.
+
+commit 055d3747dbf00ce85c6872ecca4d466638e80c22 upstream.
+
+commit 58c54fcca3bac5bf9290cfed31c76e4c4bfbabaf
+     md/raid10: handle further errors during fix_read_error better.
+
+in 3.1 added "r10_sync_page_io" which takes an IO size in sectors.
+But we were passing the IO size in bytes!!!
+This resulting in bio_add_page failing, and empty request being sent
+down, and a consequent BUG_ON in scsi_lib.
+
+[fix missing space in error message at same time]
+
+This fix is suitable for 3.1.y and later.
+
+Reported-by: Christian Balzer <chibi@gol.com>
+Signed-off-by: NeilBrown <neilb@suse.de>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/md/raid10.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
+index 3b67566..7a9eef6 100644
+--- a/drivers/md/raid10.c
++++ b/drivers/md/raid10.c
+@@ -1919,7 +1919,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+                        if (r10_sync_page_io(rdev,
+                                             r10_bio->devs[sl].addr +
+                                             sect,
+-                                            s<<9, conf->tmppage, WRITE)
++                                            s, conf->tmppage, WRITE)
+                            == 0) {
+                                /* Well, this device is dead */
+                                printk(KERN_NOTICE
+@@ -1956,7 +1956,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+                        switch (r10_sync_page_io(rdev,
+                                             r10_bio->devs[sl].addr +
+                                             sect,
+-                                            s<<9, conf->tmppage,
++                                            s, conf->tmppage,
+                                                 READ)) {
+                        case 0:
+                                /* Well, this device is dead */
+@@ -2119,7 +2119,7 @@ read_more:
+        rdev = conf->mirrors[mirror].rdev;
+        printk_ratelimited(
+                KERN_ERR
+-               "md/raid10:%s: %s: redirecting"
++               "md/raid10:%s: %s: redirecting "
+                "sector %llu to another mirror\n",
+                mdname(mddev),
+                bdevname(rdev->bdev, b),
+-- 
+1.7.10
+