blk-mq: move blk_mq_put_driver_tag() into blk-mq.c (723bf178) · Commits · 戴 / test

block/blk-mq.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -666,6 +666,26 @@ static inline bool blk_mq_complete_need_ipi(struct request *rq)
		return cpu_online(rq->mq_ctx->cpu);
		}

		static void __blk_mq_put_driver_tag(struct blk_mq_hw_ctx *hctx,
		struct request *rq)
		{
		blk_mq_put_tag(hctx->tags, rq->mq_ctx, rq->tag);
		rq->tag = BLK_MQ_NO_TAG;

		if (rq->rq_flags & RQF_MQ_INFLIGHT) {
		rq->rq_flags &= ~RQF_MQ_INFLIGHT;
		atomic_dec(&hctx->nr_active);
		}
		}

		static inline void blk_mq_put_driver_tag(struct request *rq)
		{
		if (rq->tag == BLK_MQ_NO_TAG \|\| rq->internal_tag == BLK_MQ_NO_TAG)
		return;

		__blk_mq_put_driver_tag(rq->mq_hctx, rq);
		}

		bool blk_mq_complete_request_remote(struct request *rq)
		{
		WRITE_ONCE(rq->state, MQ_RQ_COMPLETE);

+0 −20

Original line number	Diff line number	Diff line
		@@ -193,26 +193,6 @@ static inline bool blk_mq_get_dispatch_budget(struct request_queue *q)
		return true;
		}

		static inline void __blk_mq_put_driver_tag(struct blk_mq_hw_ctx *hctx,
		struct request *rq)
		{
		blk_mq_put_tag(hctx->tags, rq->mq_ctx, rq->tag);
		rq->tag = BLK_MQ_NO_TAG;

		if (rq->rq_flags & RQF_MQ_INFLIGHT) {
		rq->rq_flags &= ~RQF_MQ_INFLIGHT;
		atomic_dec(&hctx->nr_active);
		}
		}

		static inline void blk_mq_put_driver_tag(struct request *rq)
		{
		if (rq->tag == BLK_MQ_NO_TAG \|\| rq->internal_tag == BLK_MQ_NO_TAG)
		return;

		__blk_mq_put_driver_tag(rq->mq_hctx, rq);
		}

		static inline void blk_mq_clear_mq_map(struct blk_mq_queue_map *qmap)
		{
		int cpu;