1 files changed, 16 insertions, 9 deletions

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 16ba55ad7089..a5f94125ad01 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -942,21 +942,28 @@ static int dm_table_alloc_md_mempools(struct dm_table *t, struct mapped_device *
 {
         unsigned type = dm_table_get_type(t);
         unsigned per_bio_data_size = 0;
-        struct dm_target *tgt;
         unsigned i;
 
-        if (unlikely(type == DM_TYPE_NONE)) {
+        switch (type) {
+        case DM_TYPE_BIO_BASED:
+                for (i = 0; i < t->num_targets; i++) {
+                        struct dm_target *tgt = t->targets + i;
+
+                        per_bio_data_size = max(per_bio_data_size,
+                                                tgt->per_bio_data_size);
+                }
+                t->mempools = dm_alloc_bio_mempools(t->integrity_supported,
+                                                    per_bio_data_size);
+                break;
+        case DM_TYPE_REQUEST_BASED:
+        case DM_TYPE_MQ_REQUEST_BASED:
+                t->mempools = dm_alloc_rq_mempools(md, type);
+                break;
+        default:
                 DMWARN("no table type is set, can't allocate mempools");
                 return -EINVAL;
         }
 
-        if (type == DM_TYPE_BIO_BASED)
-                for (i = 0; i < t->num_targets; i++) {
-                        tgt = t->targets + i;
-                        per_bio_data_size = max(per_bio_data_size, tgt->per_bio_data_size);
-                }
-
-        t->mempools = dm_alloc_md_mempools(md, type, t->integrity_supported, per_bio_data_size);
         if (!t->mempools)
                 return -ENOMEM;