diff options
| author | Jens Axboe <axboe@fb.com> | 2014-06-06 19:03:48 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-06-06 19:05:25 +0200 |
| commit | f6be4fb4bcb396fc3b1c134b7863351972de081f (patch) | |
| tree | 26805801b0e62474c4e70bfbf5e32512d6271efa /block | |
| parent | blk-mq: don't allow queue entering for a dying queue (diff) | |
| download | linux-f6be4fb4bcb396fc3b1c134b7863351972de081f.tar.xz linux-f6be4fb4bcb396fc3b1c134b7863351972de081f.zip | |
blk-mq: ->timeout should be cleared in blk_mq_rq_ctx_init()
It'll be used in blk_mq_start_request() to set a potential timeout
for the request, so clear it to zero at alloc time to ensure that
we know if someone has set it or not.
Fixes random early timeouts on NVMe testing.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 75fc33f34251..fafea52281ac 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -204,6 +204,8 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx, rq->sense = NULL; INIT_LIST_HEAD(&rq->timeout_list); + rq->timeout = 0; + rq->end_io = NULL; rq->end_io_data = NULL; rq->next_rq = NULL; |