Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md:
  md/raid10:  Fix bug when activating a hot-spare.
This commit is contained in:
Linus Torvalds 2011-10-31 15:21:29 -07:00
commit 571109f536

View file

@ -1355,7 +1355,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)
struct mirror_info *p = &conf->mirrors[mirror];
if (p->recovery_disabled == mddev->recovery_disabled)
continue;
if (!p->rdev)
if (p->rdev)
continue;
disk_stack_limits(mddev->gendisk, rdev->bdev,