Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

block: remove REQ_NO_TIMEOUT flag 



This was added for the 'magic' AEN requests in the NVMe driver that never
return.  We now handle them purely inside the driver and don't need this
core hack any more.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f4800d6d

block/blk-mq.c

+0 −2
Original line number Diff line number Diff line
@@ -603,8 +603,6 @@ static void blk_mq_check_expired(struct blk_mq_hw_ctx *hctx, 
			blk_mq_complete_request(rq, -EIO);

		return;

	}

	if (rq->cmd_flags & REQ_NO_TIMEOUT)

		return;



	if (time_after_eq(jiffies, rq->deadline)) {

		if (!blk_mark_rq_complete(rq))

block/blk-timeout.c

+0 −3
Original line number Diff line number Diff line
@@ -197,9 +197,6 @@ void blk_add_timer(struct request *req) 
	struct request_queue *q = req->q;

	unsigned long expiry;



	if (req->cmd_flags & REQ_NO_TIMEOUT)

		return;



	/* blk-mq has its own handler, so we don't need ->rq_timed_out_fn */

	if (!q->mq_ops && !q->rq_timed_out_fn)

		return;

include/linux/blk_types.h

+0 −2
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ enum rq_flag_bits { 
	__REQ_PM,		/* runtime pm request */

	__REQ_HASHED,		/* on IO scheduler merge hash */

	__REQ_MQ_INFLIGHT,	/* track inflight for MQ */

	__REQ_NO_TIMEOUT,	/* requests may never expire */

	__REQ_NR_BITS,		/* stops here */

};
@@ -242,7 +241,6 @@ enum rq_flag_bits { 
#define REQ_PM			(1ULL << __REQ_PM)

#define REQ_HASHED		(1ULL << __REQ_HASHED)

#define REQ_MQ_INFLIGHT		(1ULL << __REQ_MQ_INFLIGHT)

#define REQ_NO_TIMEOUT		(1ULL << __REQ_NO_TIMEOUT)



typedef unsigned int blk_qc_t;

#define BLK_QC_T_NONE	-1U