Commit 5b8c01f7 authored by Bart Van Assche's avatar Bart Van Assche Committed by Mike Snitzer
Browse files

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: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 301fc3f5

drivers/md/dm-table.c

+8 −13
Original line number Diff line number Diff line
@@ -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 @@ static int dm_table_determine_type(struct dm_table *t) 
		}



		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");

	if (sq_count && mq_count) {

		DMERR("table load rejected: not all devices are blk-mq request-stackable");

		return -EINVAL;

	}



		t->all_blk_mq = true;

	}

	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");