Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 571109f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 839d8810 7fcc7c8a

drivers/md/raid10.c

+1 −1
Original line number Diff line number Diff line
@@ -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,