Skip to contentSkip to conversation

blk-mq: put blk_queue_rq_timeout together in blk_mq_init_queue.

PATCH Applied fangwei 2 participants 2 messages Mar 30, 2015 Block layer

lore
Share & tools
lore

fangwei

author
#0 lore raw

PATCH 1/1 blk-mq: put blk_queue_rq_timeout together in blk_mq_init_queue.

Don't assign ->rq_timeout twice.

Signed-off-by Wei Fang <[email protected]>
---
 block/blk-mq.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
block/blk-mq.c +1 -4
index 4f4bea2..45e91b4 100644
@@ -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...
         */
Signature · 1 line
1.8.3.1
maintainer Applied
#1 lore raw
Quoted 1 line · fangwei

Don't assign ->rq_timeout twice.

Thanks, applied.

Signature · 1 line
Jens Axboe