imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-11-01 14:53:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

blk-mq: put blk_queue_rq_timeout together in blk_mq_init_queue()

Browse Source 
Don't assign ->rq_timeout twice.

Signed-off-by: Wei Fang <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
Wei Fang authored and Jens Axboe committed 2015-03-30 09:07:00 -06:00
1 parent f9018ac930
commit c76cbbcf40
1 file changed
+1 -4
Download Patch File Download Diff File Expand all files Collapse all files
block/blk-mq.c
+1 -4
View File
@@ -1956,7 +1956,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, 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;
@@ -1982,9 +1982,6 @@ struct request_queue *blk_mq_init_allocated_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...
*/