]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[PATCH] md: Avoid oops when attempting to fix read errors on raid10
authorNeilBrown <neilb@suse.de>
Mon, 1 May 2006 19:15:44 +0000 (12:15 -0700)
committerChris Wright <chrisw@sous-sol.org>
Sat, 20 May 2006 22:00:27 +0000 (15:00 -0700)
We should add to the counter for the rdev *after* checking if the rdev is
NULL!!!

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
drivers/md/raid10.c

index ab90a6d1202043f7d332fe5f613be414845f1107..039ed49b3c030462d8cd0e54ab84e97c0d85fc26 100644 (file)
@@ -1436,9 +1436,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,