blk-mq: Rename blk_mq_update_tag_set_depth() (655ac300) · Commits · 戴 / test

The function does not set the depth, but rather transitions from shared to non-shared queues and vice versa. So rename it to blk_mq_update_tag_set_shared() to better reflect its purpose. [jpg: take out some unrelated changes in blk_mq_init_bitmap_tags()] Signed-off-by:

Hannes Reinecke <hare@suse.de> Signed-off-by:

John Garry <john.garry@huawei.com> Tested-by:

Douglas Gilbert <dgilbert@interlog.com> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

block/blk-mq.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2891,7 +2891,7 @@ static void queue_set_hctx_shared(struct request_queue *q, bool shared)
		}
		}

		static void blk_mq_update_tag_set_depth(struct blk_mq_tag_set *set,
		static void blk_mq_update_tag_set_shared(struct blk_mq_tag_set *set,
		bool shared)
		{
		struct request_queue *q;
		@@ -2915,7 +2915,7 @@ static void blk_mq_del_queue_tag_set(struct request_queue *q)
		/* just transitioned to unshared */
		set->flags &= ~BLK_MQ_F_TAG_QUEUE_SHARED;
		/* update existing queue */
		blk_mq_update_tag_set_depth(set, false);
		blk_mq_update_tag_set_shared(set, false);
		}
		mutex_unlock(&set->tag_list_lock);
		INIT_LIST_HEAD(&q->tag_set_list);
		@@ -2933,7 +2933,7 @@ static void blk_mq_add_queue_tag_set(struct blk_mq_tag_set *set,
		!(set->flags & BLK_MQ_F_TAG_QUEUE_SHARED)) {
		set->flags \|= BLK_MQ_F_TAG_QUEUE_SHARED;
		/* update existing queue */
		blk_mq_update_tag_set_depth(set, true);
		blk_mq_update_tag_set_shared(set, true);
		}
		if (set->flags & BLK_MQ_F_TAG_QUEUE_SHARED)
		queue_set_hctx_shared(q, true);

Admin message