From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752777AbbC3Lyw (ORCPT ); Mon, 30 Mar 2015 07:54:52 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:24461 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751923AbbC3Lyt (ORCPT ); Mon, 30 Mar 2015 07:54:49 -0400 Message-ID: <551938AE.5080002@huawei.com> Date: Mon, 30 Mar 2015 19:51:10 +0800 From: fangwei User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: CC: Subject: [PATCH] blk-mq: put blk_queue_rq_timeout together in blk_mq_init_queue. Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.235.173] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Don't assign ->rq_timeout twice. Signed-off-by: Wei Fang --- block/blk-mq.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 4f4bea2..45e91b4 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1941,7 +1941,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) goto err_map; setup_timer(&q->timeout, blk_mq_rq_timer, (unsigned long) q); - blk_queue_rq_timeout(q, 30000); + blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30000); q->nr_queues = nr_cpu_ids; q->nr_hw_queues = set->nr_hw_queues; @@ -1967,9 +1967,6 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) else blk_queue_make_request(q, blk_sq_make_request); - if (set->timeout) - blk_queue_rq_timeout(q, set->timeout); - /* * Do this after blk_queue_make_request() overrides it... */ -- 1.8.3.1