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: Yufen Yu <yuyufen@huawei.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Родитель
1bdd3dbfff
Коммит
13f0638152
|
@ -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);
|
blk_mq_tag_set_rq(hctx, flush_rq->tag, fq->orig_rq);
|
||||||
flush_rq->tag = -1;
|
flush_rq->tag = -1;
|
||||||
} else {
|
} else {
|
||||||
blk_mq_put_driver_tag_hctx(hctx, flush_rq);
|
blk_mq_put_driver_tag(flush_rq);
|
||||||
flush_rq->internal_tag = -1;
|
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) {
|
if (q->elevator) {
|
||||||
WARN_ON(rq->tag < 0);
|
WARN_ON(rq->tag < 0);
|
||||||
blk_mq_put_driver_tag_hctx(hctx, rq);
|
blk_mq_put_driver_tag(rq);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -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)
|
static inline void blk_mq_put_driver_tag(struct request *rq)
|
||||||
{
|
{
|
||||||
if (rq->tag == -1 || rq->internal_tag == -1)
|
if (rq->tag == -1 || rq->internal_tag == -1)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче