aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-timeout.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-11-07 03:39:28 -0500
committerJens Axboe <axboe@fb.com>2015-12-22 11:38:34 -0500
commitbbc758ec04c2f30805ce0fcdfbaa4c3445fafbae (patch)
treec21b3c256ba04e5ea21d34f3eeb1a24694e906f3 /block/blk-timeout.c
parentf4800d6d1548e0d5ab94f2216d41d94282e2588c (diff)
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: Christoph Hellwig <hch@lst.de> Acked-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-timeout.c')
-rw-r--r--block/blk-timeout.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index dd4fdfbcb3dd..a30441a200c0 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -197,9 +197,6 @@ void blk_add_timer(struct request *req)
197 struct request_queue *q = req->q; 197 struct request_queue *q = req->q;
198 unsigned long expiry; 198 unsigned long expiry;
199 199
200 if (req->cmd_flags & REQ_NO_TIMEOUT)
201 return;
202
203 /* blk-mq has its own handler, so we don't need ->rq_timed_out_fn */ 200 /* blk-mq has its own handler, so we don't need ->rq_timed_out_fn */
204 if (!q->mq_ops && !q->rq_timed_out_fn) 201 if (!q->mq_ops && !q->rq_timed_out_fn)
205 return; 202 return;