Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2278d69f authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

blk-mq: don't pass **hctx to blk_mq_mark_tag_wait() 



'hctx' won't be changed at all, so not necessary to pass
'**hctx' to blk_mq_mark_tag_wait().

Cc: Christoph Hellwig <hch@lst.de>
Cc: Bart Van Assche <bart.vanassche@wdc.com>
Tested-by: default avatarAndrew Jones <drjones@redhat.com>
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8ab6bb9e

block/blk-mq.c

+11 −12
Original line number Diff line number Diff line
@@ -1009,17 +1009,16 @@ static int blk_mq_dispatch_wake(wait_queue_entry_t *wait, unsigned mode, 
 * restart. For both cases, take care to check the condition again after

 * marking us as waiting.

 */

static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx **hctx,

static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx,

				 struct request *rq)

{

	struct blk_mq_hw_ctx *this_hctx = *hctx;

	struct sbq_wait_state *ws;

	wait_queue_entry_t *wait;

	bool ret;



	if (!(this_hctx->flags & BLK_MQ_F_TAG_SHARED)) {

		if (!test_bit(BLK_MQ_S_SCHED_RESTART, &this_hctx->state))

			set_bit(BLK_MQ_S_SCHED_RESTART, &this_hctx->state);

	if (!(hctx->flags & BLK_MQ_F_TAG_SHARED)) {

		if (!test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state))

			set_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state);



		/*

		 * It's possible that a tag was freed in the window between the
@@ -1032,17 +1031,17 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx **hctx, 
		return blk_mq_get_driver_tag(rq);

	}



	wait = &this_hctx->dispatch_wait;

	wait = &hctx->dispatch_wait;

	if (!list_empty_careful(&wait->entry))

		return false;



	spin_lock(&this_hctx->lock);

	spin_lock(&hctx->lock);

	if (!list_empty(&wait->entry)) {

		spin_unlock(&this_hctx->lock);

		spin_unlock(&hctx->lock);

		return false;

	}



	ws = bt_wait_ptr(&this_hctx->tags->bitmap_tags, this_hctx);

	ws = bt_wait_ptr(&hctx->tags->bitmap_tags, hctx);

	add_wait_queue(&ws->wait, wait);



	/*
@@ -1052,7 +1051,7 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx **hctx, 
	 */

	ret = blk_mq_get_driver_tag(rq);

	if (!ret) {

		spin_unlock(&this_hctx->lock);

		spin_unlock(&hctx->lock);

		return false;

	}
@@ -1063,7 +1062,7 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx **hctx, 
	spin_lock_irq(&ws->wait.lock);

	list_del_init(&wait->entry);

	spin_unlock_irq(&ws->wait.lock);

	spin_unlock(&this_hctx->lock);

	spin_unlock(&hctx->lock);



	return true;

}
@@ -1108,7 +1107,7 @@ bool blk_mq_dispatch_rq_list(struct request_queue *q, struct list_head *list, 
			 * before we add this entry back on the dispatch list,

			 * we'll re-run it below.

			 */

			if (!blk_mq_mark_tag_wait(&hctx, rq)) {

			if (!blk_mq_mark_tag_wait(hctx, rq)) {

				blk_mq_put_dispatch_budget(hctx);

				/*

				 * For non-shared tags, the RESTART check