diff options
| author | Ming Lei <ming.lei@canonical.com> | 2015-07-16 13:53:22 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-07-16 16:39:11 +0200 |
| commit | e56f698bd0720e17f10f39e8b0b5b446ad0ab22c (patch) | |
| tree | 3fdbc929bb1bfaffff5bc28aba742352094a99dc /block/blk-mq.c | |
| parent | NVMe: Reread partitions on metadata formats (diff) | |
| download | linux-e56f698bd0720e17f10f39e8b0b5b446ad0ab22c.tar.xz linux-e56f698bd0720e17f10f39e8b0b5b446ad0ab22c.zip | |
blk-mq: set default timeout as 30 seconds
It is reasonable to set default timeout of request as 30 seconds instead of
30000 ticks, which may be 300 seconds if HZ is 100, for example, some arm64
based systems may choose 100 HZ.
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Fixes: c76cbbcf4044 ("blk-mq: put blk_queue_rq_timeout together in blk_mq_init_queue()"
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index f53779692c77..7d842db59699 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1998,7 +1998,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, goto err_hctxs; setup_timer(&q->timeout, blk_mq_rq_timer, (unsigned long) q); - blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30000); + blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30 * HZ); q->nr_queues = nr_cpu_ids; q->nr_hw_queues = set->nr_hw_queues; |