Commit 28a1ae6b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: remove blk_qc_t_valid 



Move the trivial check into the only caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Tested-by: default avatarMark Wunderlich <mark.wunderlich@intel.com>
Link: https://lore.kernel.org/r/20211012111226.760968-9-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent efbabbe1

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -4098,7 +4098,7 @@ static int blk_mq_poll_classic(struct request_queue *q, blk_qc_t cookie, 
 */

int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin)

{

	if (!blk_qc_t_valid(cookie) ||

	if (cookie == BLK_QC_T_NONE ||

	    !test_bit(QUEUE_FLAG_POLL, &q->queue_flags))

		return 0;

include/linux/blk_types.h

+0 −5
Original line number Diff line number Diff line
@@ -500,11 +500,6 @@ typedef unsigned int blk_qc_t; 
#define BLK_QC_T_SHIFT		16

#define BLK_QC_T_INTERNAL	(1U << 31)



static inline bool blk_qc_t_valid(blk_qc_t cookie)

{

	return cookie != BLK_QC_T_NONE;

}



struct blk_rq_stat {

	u64 mean;

	u64 min;