Commit 7b7ab780 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

block: make request_to_qc_t public 



block consumers will need it for polling requests that
are sent with blk_execute_rq_nowait. Also, get rid of
blk_tag_to_qc_t and open-code it instead.

Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 56a77d26

block/blk-mq.c

+0 −8
Original line number Diff line number Diff line
@@ -1749,14 +1749,6 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio) 
	blk_account_io_start(rq, true);

}



static blk_qc_t request_to_qc_t(struct blk_mq_hw_ctx *hctx, struct request *rq)

{

	if (rq->tag != -1)

		return blk_tag_to_qc_t(rq->tag, hctx->queue_num, false);



	return blk_tag_to_qc_t(rq->internal_tag, hctx->queue_num, true);

}



static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx,

					    struct request *rq,

					    blk_qc_t *cookie, bool last)

include/linux/blk-mq.h

+10 −0
Original line number Diff line number Diff line
@@ -357,4 +357,14 @@ static inline void *blk_mq_rq_to_pdu(struct request *rq) 
	for ((i) = 0; (i) < (hctx)->nr_ctx &&				\

	     ({ ctx = (hctx)->ctxs[(i)]; 1; }); (i)++)



static inline blk_qc_t request_to_qc_t(struct blk_mq_hw_ctx *hctx,

		struct request *rq)

{

	if (rq->tag != -1)

		return rq->tag | (hctx->queue_num << BLK_QC_T_SHIFT);



	return rq->internal_tag | (hctx->queue_num << BLK_QC_T_SHIFT) |

			BLK_QC_T_INTERNAL;

}



#endif

include/linux/blk_types.h

+0 −11
Original line number Diff line number Diff line
@@ -425,17 +425,6 @@ static inline bool blk_qc_t_valid(blk_qc_t cookie) 
	return cookie != BLK_QC_T_NONE;

}



static inline blk_qc_t blk_tag_to_qc_t(unsigned int tag, unsigned int queue_num,

				       bool internal)

{

	blk_qc_t ret = tag | (queue_num << BLK_QC_T_SHIFT);



	if (internal)

		ret |= BLK_QC_T_INTERNAL;



	return ret;

}



static inline unsigned int blk_qc_t_to_queue_num(blk_qc_t cookie)

{

	return (cookie & ~BLK_QC_T_INTERNAL) >> BLK_QC_T_SHIFT;