|
@@ -924,12 +924,6 @@ static int dm_table_determine_type(struct dm_table *t)
|
|
|
|
|
|
BUG_ON(!request_based); /* No targets in this table */
|
|
|
|
|
|
- if (list_empty(devices) && __table_type_request_based(live_md_type)) {
|
|
|
- /* inherit live MD type */
|
|
|
- t->type = live_md_type;
|
|
|
- return 0;
|
|
|
- }
|
|
|
-
|
|
|
/*
|
|
|
* The only way to establish DM_TYPE_MQ_REQUEST_BASED is by
|
|
|
* having a compatible target use dm_table_set_type.
|
|
@@ -948,6 +942,19 @@ verify_rq_based:
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
+ if (list_empty(devices)) {
|
|
|
+ int srcu_idx;
|
|
|
+ struct dm_table *live_table = dm_get_live_table(t->md, &srcu_idx);
|
|
|
+
|
|
|
+ /* inherit live table's type and all_blk_mq */
|
|
|
+ if (live_table) {
|
|
|
+ t->type = live_table->type;
|
|
|
+ t->all_blk_mq = live_table->all_blk_mq;
|
|
|
+ }
|
|
|
+ dm_put_live_table(t->md, srcu_idx);
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
/* Non-request-stackable devices can't be used for request-based dm */
|
|
|
list_for_each_entry(dd, devices, list) {
|
|
|
struct request_queue *q = bdev_get_queue(dd->dm_dev->bdev);
|