1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 9c788e2489b1..7b4f5f7155d8 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1016,12 +1016,16 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
          * else mark the drive as failed
          */
         if (test_bit(In_sync, &rdev->flags)
-            && (conf->raid_disks - mddev->degraded) == 1)
+            && (conf->raid_disks - mddev->degraded) == 1) {
                 /*
                  * Don't fail the drive, act as though we were just a
-                 * normal single drive
+                 * normal single drive.
+                 * However don't try a recovery from this drive as
+                 * it is very likely to fail.
                  */
+                mddev->recovery_disabled = 1;
                 return;
+        }
         if (test_and_clear_bit(In_sync, &rdev->flags)) {
                 unsigned long flags;
                 spin_lock_irqsave(&conf->device_lock, flags);
@@ -1919,7 +1923,6 @@ static int run(mddev_t *mddev)
         int i, j, disk_idx;
         mirror_info_t *disk;
         mdk_rdev_t *rdev;
-        struct list_head *tmp;
 
         if (mddev->level != 1) {
                 printk("raid1: %s: raid level not set to mirroring (%d)\n",
@@ -1964,7 +1967,7 @@ static int run(mddev_t *mddev)
         spin_lock_init(&conf->device_lock);
         mddev->queue->queue_lock = &conf->device_lock;
 
-        rdev_for_each(rdev, tmp, mddev) {
+        list_for_each_entry(rdev, &mddev->disks, same_set) {
                 disk_idx = rdev->raid_disk;
                 if (disk_idx >= mddev->raid_disks
                     || disk_idx < 0)