summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2015-07-16 19:53:22 +0800
committerJens Axboe <axboe@fb.com>2015-07-16 08:39:11 -0600
commite56f698bd0720e17f10f39e8b0b5b446ad0ab22c (patch)
tree3fdbc929bb1bfaffff5bc28aba742352094a99dc /block
parent7bee607472aa2e5a36dfe143e5a625be06125f53 (diff)
downloadlinux-stable-e56f698bd0720e17f10f39e8b0b5b446ad0ab22c.tar.gz
linux-stable-e56f698bd0720e17f10f39e8b0b5b446ad0ab22c.tar.bz2
linux-stable-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')
-rw-r--r--block/blk-mq.c2
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;