diff options
| author |   Bart Van Assche <bart.vanassche@sandisk.com> | 2016-11-15 15:33:16 -0800 |
|---|---|---|
| committer |   Mike Snitzer <snitzer@redhat.com> | 2016-12-08 14:13:03 -0500 |
| commit | 5b8c01f74cf03b1ec013fcf358b384706233f2f0 (patch) | |
| tree | 81940efae26d1b96bb430a606dacf4abaee1157e /drivers/md/dm-table.c | |
| parent | dm table: an 'all_blk_mq' table must be loaded for a blk-mq DM device (diff) | |
| download | linux-dev-5b8c01f74cf03b1ec013fcf358b384706233f2f0.tar.xz linux-dev-5b8c01f74cf03b1ec013fcf358b384706233f2f0.zip | |
dm table: simplify dm_table_determine_type()
Use a single loop instead of two loops to determine whether or not
all_blk_mq has to be set.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/md/dm-table.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 5ac239d0f787..0a427de23ed2 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -871,7 +871,7 @@ static int dm_table_determine_type(struct dm_table *t) { unsigned i; unsigned bio_based = 0, request_based = 0, hybrid = 0; - bool verify_blk_mq = false; + unsigned sq_count = 0, mq_count = 0; struct dm_target *tgt; struct dm_dev_internal *dd; struct list_head *devices = dm_table_get_devices(t); @@ -966,20 +966,15 @@ verify_rq_based: } if (q->mq_ops) - verify_blk_mq = true; + mq_count++; + else + sq_count++; } - - if (verify_blk_mq) { - /* verify _all_ devices in the table are blk-mq devices */ - list_for_each_entry(dd, devices, list) - if (!bdev_get_queue(dd->dm_dev->bdev)->mq_ops) { - DMERR("table load rejected: not all devices" - " are blk-mq request-stackable"); - return -EINVAL; - } - - t->all_blk_mq = true; + if (sq_count && mq_count) { + DMERR("table load rejected: not all devices are blk-mq request-stackable"); + return -EINVAL; } + t->all_blk_mq = mq_count > 0; if (t->type == DM_TYPE_MQ_REQUEST_BASED && !t->all_blk_mq) { DMERR("table load rejected: all devices are not blk-mq request-stackable"); |