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

* 'for-linus' of git://neil.brown.name/md:
  md: avoid endless recovery loop when waiting for fail device to complete.

drivers/md/md.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -7088,6 +7088,7 @@ static int remove_and_add_spares(mddev_t *mddev)
		list_for_each_entry(rdev, &mddev->disks, same_set) {
		if (rdev->raid_disk >= 0 &&
		!test_bit(In_sync, &rdev->flags) &&
		!test_bit(Faulty, &rdev->flags) &&
		!test_bit(Blocked, &rdev->flags))
		spares++;
		if (rdev->raid_disk < 0