From: NeilBrown <neilb@suse.de>
Date: Mon, 1 May 2006 19:15:44 +0000 (-0700)
Subject: [PATCH] md: Avoid oops when attempting to fix read errors on raid10
X-Git-Tag: v2.6.17-rc4~99
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=df30d0f4ca3c41b60068232d6de9d58be88436f0;p=linux-2.6-omap-h63xx.git

[PATCH] md: Avoid oops when attempting to fix read errors on raid10

We should add to the counter for the rdev *after* checking if the rdev is
NULL!!!

Signed-off-by: Neil Brown <neilb@suse.de>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 617012bc107..ddc1dfc4d3d 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1435,9 +1435,9 @@ static void raid10d(mddev_t *mddev)
 						sl--;
 						d = r10_bio->devs[sl].devnum;
 						rdev = conf->mirrors[d].rdev;
-						atomic_add(s, &rdev->corrected_errors);
 						if (rdev &&
 						    test_bit(In_sync, &rdev->flags)) {
+							atomic_add(s, &rdev->corrected_errors);
 							if (sync_page_io(rdev->bdev,
 									 r10_bio->devs[sl].addr +
 									 sect + rdev->data_offset,