1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index d1b9bd5fd4f6..e07ce2e033a9 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -64,7 +64,7 @@ static void * r1bio_pool_alloc(gfp_t gfp_flags, void *data)
 
         /* allocate a r1bio with room for raid_disks entries in the bios array */
         r1_bio = kzalloc(size, gfp_flags);
-        if (!r1_bio)
+        if (!r1_bio && pi->mddev)
                 unplug_slaves(pi->mddev);
 
         return r1_bio;
@@ -1650,11 +1650,12 @@ static void raid1d(mddev_t *mddev)
                                                r1_bio->sector,
                                                r1_bio->sectors);
                                 unfreeze_array(conf);
-                        }
+                        } else
+                                md_error(mddev,
+                                         conf->mirrors[r1_bio->read_disk].rdev);
 
                         bio = r1_bio->bios[r1_bio->read_disk];
-                        if ((disk=read_balance(conf, r1_bio)) == -1 ||
-                            disk == r1_bio->read_disk) {
+                        if ((disk=read_balance(conf, r1_bio)) == -1) {
                                 printk(KERN_ALERT "raid1: %s: unrecoverable I/O"
                                        " read error for block %llu\n",
                                        bdevname(bio->bi_bdev,b),
@@ -1683,6 +1684,7 @@ static void raid1d(mddev_t *mddev)
                                 generic_make_request(bio);
                         }
                 }
+                cond_resched();
         }
         if (unplug)
                 unplug_slaves(mddev);
@@ -1978,13 +1980,14 @@ static int run(mddev_t *mddev)
         conf->poolinfo = kmalloc(sizeof(*conf->poolinfo), GFP_KERNEL);
         if (!conf->poolinfo)
                 goto out_no_mem;
-        conf->poolinfo->mddev = mddev;
+        conf->poolinfo->mddev = NULL;
         conf->poolinfo->raid_disks = mddev->raid_disks;
         conf->r1bio_pool = mempool_create(NR_RAID1_BIOS, r1bio_pool_alloc,
                                           r1bio_pool_free,
                                           conf->poolinfo);
         if (!conf->r1bio_pool)
                 goto out_no_mem;
+        conf->poolinfo->mddev = mddev;
 
         spin_lock_init(&conf->device_lock);
         mddev->queue->queue_lock = &conf->device_lock;