1 files changed, 44 insertions, 6 deletions

diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 4d6bc101962e..536ef0bef154 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -145,6 +145,8 @@ struct dm_raid1_read_record {
         struct dm_bio_details details;
 };
 
+static struct kmem_cache *_dm_raid1_read_record_cache;
+
 /*
  * Every mirror should look like this one.
  */
@@ -586,6 +588,9 @@ static void do_writes(struct mirror_set *ms, struct bio_list *writes)
         int state;
         struct bio *bio;
         struct bio_list sync, nosync, recover, *this_list = NULL;
+        struct bio_list requeue;
+        struct dm_dirty_log *log = dm_rh_dirty_log(ms->rh);
+        region_t region;
 
         if (!writes->head)
                 return;
@@ -596,10 +601,18 @@ static void do_writes(struct mirror_set *ms, struct bio_list *writes)
         bio_list_init(&sync);
         bio_list_init(&nosync);
         bio_list_init(&recover);
+        bio_list_init(&requeue);
 
         while ((bio = bio_list_pop(writes))) {
-                state = dm_rh_get_state(ms->rh,
-                                        dm_rh_bio_to_region(ms->rh, bio), 1);
+                region = dm_rh_bio_to_region(ms->rh, bio);
+
+                if (log->type->is_remote_recovering &&
+                    log->type->is_remote_recovering(log, region)) {
+                        bio_list_add(&requeue, bio);
+                        continue;
+                }
+
+                state = dm_rh_get_state(ms->rh, region, 1);
                 switch (state) {
                 case DM_RH_CLEAN:
                 case DM_RH_DIRTY:
@@ -619,6 +632,16 @@ static void do_writes(struct mirror_set *ms, struct bio_list *writes)
         }
 
         /*
+         * Add bios that are delayed due to remote recovery
+         * back on to the write queue
+         */
+        if (unlikely(requeue.head)) {
+                spin_lock_irq(&ms->lock);
+                bio_list_merge(&ms->writes, &requeue);
+                spin_unlock_irq(&ms->lock);
+        }
+
+        /*
          * Increment the pending counts for any regions that will
          * be written to (writes to recover regions are going to
          * be delayed).
@@ -764,9 +787,9 @@ static struct mirror_set *alloc_context(unsigned int nr_mirrors,
         atomic_set(&ms->suspend, 0);
         atomic_set(&ms->default_mirror, DEFAULT_MIRROR);
 
-        len = sizeof(struct dm_raid1_read_record);
-        ms->read_record_pool = mempool_create_kmalloc_pool(MIN_READ_RECORDS,
-                                                           len);
+        ms->read_record_pool = mempool_create_slab_pool(MIN_READ_RECORDS,
+                                                _dm_raid1_read_record_cache);
+
         if (!ms->read_record_pool) {
                 ti->error = "Error creating mirror read_record_pool";
                 kfree(ms);
@@ -1279,16 +1302,31 @@ static int __init dm_mirror_init(void)
 {
         int r;
 
+        _dm_raid1_read_record_cache = KMEM_CACHE(dm_raid1_read_record, 0);
+        if (!_dm_raid1_read_record_cache) {
+                DMERR("Can't allocate dm_raid1_read_record cache");
+                r = -ENOMEM;
+                goto bad_cache;
+        }
+
         r = dm_register_target(&mirror_target);
-        if (r < 0)
+        if (r < 0) {
                 DMERR("Failed to register mirror target");
+                goto bad_target;
+        }
+
+        return 0;
 
+bad_target:
+        kmem_cache_destroy(_dm_raid1_read_record_cache);
+bad_cache:
         return r;
 }
 
 static void __exit dm_mirror_exit(void)
 {
         dm_unregister_target(&mirror_target);
+        kmem_cache_destroy(_dm_raid1_read_record_cache);
 }
 
 /* Module hooks */