Commit 13f06381 authored by Yufen Yu's avatar Yufen Yu Committed by Jens Axboe
Browse files

blk-mq: use blk_mq_put_driver_tag() to put tag 



Expect arguments, blk_mq_put_driver_tag_hctx() and blk_mq_put_driver_tag()
is same. We can just use argument 'request' to put tag by blk_mq_put_driver_tag().
Then we can remove the unused blk_mq_put_driver_tag_hctx().

Signed-off-by: default avatarYufen Yu <yuyufen@huawei.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1bdd3dbf

block/blk-flush.c

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error) 
		blk_mq_tag_set_rq(hctx, flush_rq->tag, fq->orig_rq);

		flush_rq->tag = -1;

	} else {

		blk_mq_put_driver_tag_hctx(hctx, flush_rq);

		blk_mq_put_driver_tag(flush_rq);

		flush_rq->internal_tag = -1;

	}
@@ -324,7 +324,7 @@ static void mq_flush_data_end_io(struct request *rq, blk_status_t error) 


	if (q->elevator) {

		WARN_ON(rq->tag < 0);

		blk_mq_put_driver_tag_hctx(hctx, rq);

		blk_mq_put_driver_tag(rq);

	}



	/*

block/blk-mq.h

+0 −9
Original line number Diff line number Diff line
@@ -224,15 +224,6 @@ static inline void __blk_mq_put_driver_tag(struct blk_mq_hw_ctx *hctx, 
	}

}



static inline void blk_mq_put_driver_tag_hctx(struct blk_mq_hw_ctx *hctx,

				       struct request *rq)

{

	if (rq->tag == -1 || rq->internal_tag == -1)

		return;



	__blk_mq_put_driver_tag(hctx, rq);

}



static inline void blk_mq_put_driver_tag(struct request *rq)

{

	if (rq->tag == -1 || rq->internal_tag == -1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE