Use the block layer helper to initialize the common fields of tag_set such as blk_mq_ops, number of h/w queues, queue depth, command size, numa_node, timeout, BLK_MQ_F_XXX flags, driver data. This initialization is spread all over the block drivers. This avoids the code repetation of the inialization code of the tag set in current block drivers and any future ones. Signed-off-by: Chaitanya Kulkarni <kch@xxxxxxxxxx> --- drivers/block/rbd.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index f9e39301c4af..c666692955cd 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -4901,12 +4901,11 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) int err; memset(&rbd_dev->tag_set, 0, sizeof(rbd_dev->tag_set)); - rbd_dev->tag_set.ops = &rbd_mq_ops; - rbd_dev->tag_set.queue_depth = rbd_dev->opts->queue_depth; - rbd_dev->tag_set.numa_node = NUMA_NO_NODE; - rbd_dev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE; - rbd_dev->tag_set.nr_hw_queues = num_present_cpus(); - rbd_dev->tag_set.cmd_size = sizeof(struct rbd_img_request); + + blk_mq_init_tag_set(&rbd_dev->tag_set, &rbd_mq_ops, num_present_cpus(), + rbd_dev->opts->queue_depth, + sizeof(struct rbd_img_request), NUMA_NO_NODE, 0, + BLK_MQ_F_SHOULD_MERGE, NULL); err = blk_mq_alloc_tag_set(&rbd_dev->tag_set); if (err) -- 2.29.0
