[RFC PATCH 06/21] rnbd-clt: use lib tagset init helper

Chaitanya Kulkarni
2022-10-05T03:25:49Z

drivers/block/rnbd/rnbd-clt.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c
index 78334da74d8b..8f67a7e5299a 100644
--- a/drivers/block/rnbd/rnbd-clt.c
+++ b/drivers/block/rnbd/rnbd-clt.c
@@ -1203,25 +1203,22 @@ static struct blk_mq_ops rnbd_mq_ops = {

static int setup_mq_tags(struct rnbd_clt_session *sess)
{
- struct blk_mq_tag_set *tag_set = &sess->tag_set;
-
- memset(tag_set, 0, sizeof(*tag_set));
- tag_set->ops = &rnbd_mq_ops;
- tag_set->queue_depth = sess->queue_depth;
- tag_set->numa_node = NUMA_NO_NODE;
- tag_set->flags = BLK_MQ_F_SHOULD_MERGE |
- BLK_MQ_F_TAG_QUEUE_SHARED;
- tag_set->cmd_size = sizeof(struct rnbd_iu) + RNBD_RDMA_SGL_SIZE;
-
- /* for HCTX_TYPE_DEFAULT, HCTX_TYPE_READ, HCTX_TYPE_POLL */
- tag_set->nr_maps = sess->nr_poll_queues ? HCTX_MAX_TYPES : 2;
/*
* HCTX_TYPE_DEFAULT and HCTX_TYPE_READ share one set of queues
* others are for HCTX_TYPE_POLL
*/
- tag_set->nr_hw_queues = num_online_cpus() + sess->nr_poll_queues;
- tag_set->driver_data = sess;
+ unsigned int nr_hw_queue = num_online_cpus() + sess->nr_poll_queues;
+ struct blk_mq_tag_set *tag_set = &sess->tag_set;

+ memset(tag_set, 0, sizeof(*tag_set));
+ blk_mq_init_tag_set(tag_set, &rnbd_mq_ops, nr_hw_queue,
+ sess->queue_depth,
+ sizeof(struct rnbd_iu) + RNBD_RDMA_SGL_SIZE,
+ NUMA_NO_NODE, 0,
+ BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_TAG_QUEUE_SHARED, sess);
+ /* for HCTX_TYPE_DEFAULT, HCTX_TYPE_READ, HCTX_TYPE_POLL */
+
+ tag_set->nr_maps = sess->nr_poll_queues ? HCTX_MAX_TYPES : 2;
return blk_mq_alloc_tag_set(tag_set);
}

--
2.29.0