1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index f730a144baf1..4e53792aa520 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -917,6 +917,13 @@ static int make_request(struct request_queue *q, struct bio * bio)
                 bio_list_add(&bl, mbio);
         }
 
+        if (unlikely(!atomic_read(&r10_bio->remaining))) {
+                /* the array is dead */
+                md_write_end(mddev);
+                raid_end_bio_io(r10_bio);
+                return 0;
+        }
+
         bitmap_startwrite(mddev->bitmap, bio->bi_sector, r10_bio->sectors, 0);
         spin_lock_irqsave(&conf->device_lock, flags);
         bio_list_merge(&conf->pending_bio_list, &bl);
@@ -1557,7 +1564,6 @@ static void raid10d(mddev_t *mddev)
                         bio = r10_bio->devs[r10_bio->read_slot].bio;
                         r10_bio->devs[r10_bio->read_slot].bio =
                                 mddev->ro ? IO_BLOCKED : NULL;
-                        bio_put(bio);
                         mirror = read_balance(conf, r10_bio);
                         if (mirror == -1) {
                                 printk(KERN_ALERT "raid10: %s: unrecoverable I/O"
@@ -1565,8 +1571,10 @@ static void raid10d(mddev_t *mddev)
                                        bdevname(bio->bi_bdev,b),
                                        (unsigned long long)r10_bio->sector);
                                 raid_end_bio_io(r10_bio);
+                                bio_put(bio);
                         } else {
                                 const int do_sync = bio_sync(r10_bio->master_bio);
+                                bio_put(bio);
                                 rdev = conf->mirrors[mirror].rdev;
                                 if (printk_ratelimit())
                                         printk(KERN_ERR "raid10: %s: redirecting sector %llu to"