aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid10.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-03-05 01:48:12 -0500
committerNeilBrown <neilb@suse.de>2012-03-05 18:12:45 -0500
commit7a90484825680e7831856105f5fef654e6c02701 (patch)
tree24eacf1558541076767b59c0cbcc6b6835e35204 /drivers/md/raid10.c
parentfae8cc5ed0714953b1ad7cf86f030d2177278424 (diff)
md/raid10: fix assembling of arrays with replacement devices.
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>
Diffstat (limited to 'drivers/md/raid10.c')
-rw-r--r--drivers/md/raid10.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index bd06ea21756c..58c44d6453a0 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3260,7 +3260,6 @@ static int run(struct mddev *mddev)
3260 disk->rdev = rdev; 3260 disk->rdev = rdev;
3261 } 3261 }
3262 3262
3263 disk->rdev = rdev;
3264 disk_stack_limits(mddev->gendisk, rdev->bdev, 3263 disk_stack_limits(mddev->gendisk, rdev->bdev,
3265 rdev->data_offset << 9); 3264 rdev->data_offset << 9);
3266 /* as we don't honour merge_bvec_fn, we must never risk 3265 /* as we don't honour merge_bvec_fn, we must never risk