Commit 7642747d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: remove BLK_MQ_F_DEFER_ISSUE 



This flag was never used since it was introduced.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent d01b2dcb

block/blk-mq.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -1531,13 +1531,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) 
	}

	}





	plug = current->plug;

	plug = current->plug;

	/*

	if (((plug && !blk_queue_nomerges(q)) || is_sync)) {

	 * If the driver supports defer issued based on 'last', then

	 * queue it up like normal since we can potentially save some

	 * CPU this way.

	 */

	if (((plug && !blk_queue_nomerges(q)) || is_sync) &&

	    !(data.hctx->flags & BLK_MQ_F_DEFER_ISSUE)) {

		struct request *old_rq = NULL;

		struct request *old_rq = NULL;





		blk_mq_bio_to_request(rq, bio);

		blk_mq_bio_to_request(rq, bio);

include/linux/blk-mq.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -152,7 +152,6 @@ enum { 
	BLK_MQ_F_SHOULD_MERGE	= 1 << 0,

	BLK_MQ_F_SHOULD_MERGE	= 1 << 0,

	BLK_MQ_F_TAG_SHARED	= 1 << 1,

	BLK_MQ_F_TAG_SHARED	= 1 << 1,

	BLK_MQ_F_SG_MERGE	= 1 << 2,

	BLK_MQ_F_SG_MERGE	= 1 << 2,

	BLK_MQ_F_DEFER_ISSUE	= 1 << 4,

	BLK_MQ_F_BLOCKING	= 1 << 5,

	BLK_MQ_F_BLOCKING	= 1 << 5,

	BLK_MQ_F_NO_SCHED	= 1 << 6,

	BLK_MQ_F_NO_SCHED	= 1 << 6,

	BLK_MQ_F_ALLOC_POLICY_START_BIT = 8,

	BLK_MQ_F_ALLOC_POLICY_START_BIT = 8,

CRA Git | Maintained and supported by SUSTech CRA and CCSE