md/raid10: fix assembling of arrays with replacement devices.
authorNeilBrown <neilb@suse.de>
Mon, 5 Mar 2012 06:48:12 +0000 (17:48 +1100)
committerNeilBrown <neilb@suse.de>
Mon, 5 Mar 2012 23:12:45 +0000 (10:12 +1100)
commit 56a2559bb654a (md/raid10: recognise replacements ...)
changed 'run' to set ->replacement or ->rdev depending on the
'Replacement' status if the device, but it didn't remove the
old unconditional setting of 'rdev'.  So it was largely ineffective.

So remove that now.

Signed-off-by: NeilBrown <neilb@suse.de>
drivers/md/raid10.c

index bd06ea21756c32911cba9ec657b4e606931812b6..58c44d6453a0bfa0fb40f155c0357e4392731999 100644 (file)
@@ -3260,7 +3260,6 @@ static int run(struct mddev *mddev)
                        disk->rdev = rdev;
                }
 
-               disk->rdev = rdev;
                disk_stack_limits(mddev->gendisk, rdev->bdev,
                                  rdev->data_offset << 9);
                /* as we don't honour merge_bvec_fn, we must never risk