diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-11-07 09:39:28 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-12-22 09:38:34 -0700 |
| commit | bbc758ec04c2f30805ce0fcdfbaa4c3445fafbae (patch) | |
| tree | c21b3c256ba04e5ea21d34f3eeb1a24694e906f3 /block | |
| parent | f4800d6d1548e0d5ab94f2216d41d94282e2588c (diff) | |
| download | linux-stable-bbc758ec04c2f30805ce0fcdfbaa4c3445fafbae.tar.gz linux-stable-bbc758ec04c2f30805ce0fcdfbaa4c3445fafbae.tar.bz2 linux-stable-bbc758ec04c2f30805ce0fcdfbaa4c3445fafbae.zip | |
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')
| -rw-r--r-- | block/blk-mq.c | 2 | ||||
| -rw-r--r-- | block/blk-timeout.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 9cb2894840ab..8f812b486c07 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -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)) 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) 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; |