1 files changed, 23 insertions, 52 deletions

diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index fd61f98ee1f6..fa519185ebba 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -61,7 +61,6 @@ struct mirror_set {
         struct dm_region_hash *rh;
         struct dm_kcopyd_client *kcopyd_client;
         struct dm_io_client *io_client;
-        mempool_t *read_record_pool;
 
         /* recovery */
         region_t nr_regions;
@@ -139,14 +138,13 @@ static void dispatch_bios(void *context, struct bio_list *bio_list)
                 queue_bio(ms, bio, WRITE);
 }
 
-#define MIN_READ_RECORDS 20
-struct dm_raid1_read_record {
+struct dm_raid1_bio_record {
         struct mirror *m;
+        /* if details->bi_bdev == NULL, details were not saved */
         struct dm_bio_details details;
+        region_t write_region;
 };
 
-static struct kmem_cache *_dm_raid1_read_record_cache;
-
 /*
  * Every mirror should look like this one.
  */
@@ -876,19 +874,9 @@ static struct mirror_set *alloc_context(unsigned int nr_mirrors,
         atomic_set(&ms->suspend, 0);
         atomic_set(&ms->default_mirror, DEFAULT_MIRROR);
 
-        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);
-                return NULL;
-        }
-
         ms->io_client = dm_io_client_create();
         if (IS_ERR(ms->io_client)) {
                 ti->error = "Error creating dm_io client";
-                mempool_destroy(ms->read_record_pool);
                 kfree(ms);
                 return NULL;
         }
@@ -900,7 +888,6 @@ static struct mirror_set *alloc_context(unsigned int nr_mirrors,
         if (IS_ERR(ms->rh)) {
                 ti->error = "Error creating dirty region hash";
                 dm_io_client_destroy(ms->io_client);
-                mempool_destroy(ms->read_record_pool);
                 kfree(ms);
                 return NULL;
         }
@@ -916,7 +903,6 @@ static void free_context(struct mirror_set *ms, struct dm_target *ti,
 
         dm_io_client_destroy(ms->io_client);
         dm_region_hash_destroy(ms->rh);
-        mempool_destroy(ms->read_record_pool);
         kfree(ms);
 }
 
@@ -1088,6 +1074,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         ti->num_flush_requests = 1;
         ti->num_discard_requests = 1;
+        ti->per_bio_data_size = sizeof(struct dm_raid1_bio_record);
         ti->discard_zeroes_data_unsupported = true;
 
         ms->kmirrord_wq = alloc_workqueue("kmirrord",
@@ -1155,18 +1142,20 @@ static void mirror_dtr(struct dm_target *ti)
 /*
  * Mirror mapping function
  */
-static int mirror_map(struct dm_target *ti, struct bio *bio,
-                      union map_info *map_context)
+static int mirror_map(struct dm_target *ti, struct bio *bio)
 {
         int r, rw = bio_rw(bio);
         struct mirror *m;
         struct mirror_set *ms = ti->private;
-        struct dm_raid1_read_record *read_record = NULL;
         struct dm_dirty_log *log = dm_rh_dirty_log(ms->rh);
+        struct dm_raid1_bio_record *bio_record =
+          dm_per_bio_data(bio, sizeof(struct dm_raid1_bio_record));
+
+        bio_record->details.bi_bdev = NULL;
 
         if (rw == WRITE) {
                 /* Save region for mirror_end_io() handler */
-                map_context->ll = dm_rh_bio_to_region(ms->rh, bio);
+                bio_record->write_region = dm_rh_bio_to_region(ms->rh, bio);
                 queue_bio(ms, bio, rw);
                 return DM_MAPIO_SUBMITTED;
         }
@@ -1194,33 +1183,29 @@ static int mirror_map(struct dm_target *ti, struct bio *bio,
         if (unlikely(!m))
                 return -EIO;
 
-        read_record = mempool_alloc(ms->read_record_pool, GFP_NOIO);
-        if (likely(read_record)) {
-                dm_bio_record(&read_record->details, bio);
-                map_context->ptr = read_record;
-                read_record->m = m;
-        }
+        dm_bio_record(&bio_record->details, bio);
+        bio_record->m = m;
 
         map_bio(m, bio);
 
         return DM_MAPIO_REMAPPED;
 }
 
-static int mirror_end_io(struct dm_target *ti, struct bio *bio,
-                         int error, union map_info *map_context)
+static int mirror_end_io(struct dm_target *ti, struct bio *bio, int error)
 {
         int rw = bio_rw(bio);
         struct mirror_set *ms = (struct mirror_set *) ti->private;
         struct mirror *m = NULL;
         struct dm_bio_details *bd = NULL;
-        struct dm_raid1_read_record *read_record = map_context->ptr;
+        struct dm_raid1_bio_record *bio_record =
+          dm_per_bio_data(bio, sizeof(struct dm_raid1_bio_record));
 
         /*
          * We need to dec pending if this was a write.
          */
         if (rw == WRITE) {
                 if (!(bio->bi_rw & (REQ_FLUSH | REQ_DISCARD)))
-                        dm_rh_dec(ms->rh, map_context->ll);
+                        dm_rh_dec(ms->rh, bio_record->write_region);
                 return error;
         }
 
@@ -1231,7 +1216,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio,
                 goto out;
 
         if (unlikely(error)) {
-                if (!read_record) {
+                if (!bio_record->details.bi_bdev) {
                         /*
                          * There wasn't enough memory to record necessary
                          * information for a retry or there was no other
@@ -1241,7 +1226,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio,
                         return -EIO;
                 }
 
-                m = read_record->m;
+                m = bio_record->m;
 
                 DMERR("Mirror read failed from %s. Trying alternative device.",
                       m->dev->name);
@@ -1253,22 +1238,18 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio,
                  * mirror.
                  */
                 if (default_ok(m) || mirror_available(ms, bio)) {
-                        bd = &read_record->details;
+                        bd = &bio_record->details;
 
                         dm_bio_restore(bd, bio);
-                        mempool_free(read_record, ms->read_record_pool);
-                        map_context->ptr = NULL;
+                        bio_record->details.bi_bdev = NULL;
                         queue_bio(ms, bio, rw);
-                        return 1;
+                        return DM_ENDIO_INCOMPLETE;
                 }
                 DMERR("All replicated volumes dead, failing I/O");
         }
 
 out:
-        if (read_record) {
-                mempool_free(read_record, ms->read_record_pool);
-                map_context->ptr = NULL;
-        }
+        bio_record->details.bi_bdev = NULL;
 
         return error;
 }
@@ -1422,7 +1403,7 @@ static int mirror_iterate_devices(struct dm_target *ti,
 
 static struct target_type mirror_target = {
         .name    = "mirror",
-        .version = {1, 12, 1},
+        .version = {1, 13, 1},
         .module  = THIS_MODULE,
         .ctr     = mirror_ctr,
         .dtr     = mirror_dtr,
@@ -1439,13 +1420,6 @@ 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) {
                 DMERR("Failed to register mirror target");
@@ -1455,15 +1429,12 @@ static int __init dm_mirror_init(void)
         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 */