diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-11-07 09:39:28 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-12-22 17:38:34 +0100 |
| commit | bbc758ec04c2f30805ce0fcdfbaa4c3445fafbae (patch) | |
| tree | c21b3c256ba04e5ea21d34f3eeb1a24694e906f3 /block/blk-timeout.c | |
| parent | nvme: merge iod and cmd_info (diff) | |
| download | linux-bbc758ec04c2f30805ce0fcdfbaa4c3445fafbae.tar.xz linux-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/blk-timeout.c')
| -rw-r--r-- | block/blk-timeout.c | 3 |
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) 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; |