[PATCH] blk-mq: set default timeout as 30 seconds

[PATCH] blk-mq: set default timeout as 30 seconds

[Ming Lei]

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>
---
 block/blk-mq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index f537796..7d842db 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;
-- 
1.9.1

Re: [PATCH] blk-mq: set default timeout as 30 seconds

[Jens Axboe]

On 07/16/2015 05:53 AM, Ming Lei wrote:
> 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.

Heh, how did that not get caught in review. Thanks Ming! Should add a 
fixes c76cbbcf4044 to that, I'll do that.

-- 
Jens Axboe