aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2008-10-16 07:44:57 -0400
committerJens Axboe <jens.axboe@oracle.com>2008-10-17 02:46:57 -0400
commit713ada9ba94f2ad874cffd074b83e3dc681ca82f (patch)
treee94cae4cb7d6d8bee404feb869bceee74b402f93 /block
parent0997f1c5fec0b540784611036d458a84a1f7029a (diff)
block: move q->unplug_work initialization
modprobe loop; rmmod loop effectively creates a blk_queue and destroys it which results in q->unplug_work being canceled without it ever being initialized. Therefore, move the initialization of q->unplug_work from blk_queue_make_request() to blk_alloc_queue*(). Reported-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c1
-rw-r--r--block/blk-settings.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 8517264eb71e..fcbd56dd41fa 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -515,6 +515,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
515 init_timer(&q->unplug_timer); 515 init_timer(&q->unplug_timer);
516 setup_timer(&q->timeout, blk_rq_timed_out_timer, (unsigned long) q); 516 setup_timer(&q->timeout, blk_rq_timed_out_timer, (unsigned long) q);
517 INIT_LIST_HEAD(&q->timeout_list); 517 INIT_LIST_HEAD(&q->timeout_list);
518 INIT_WORK(&q->unplug_work, blk_unplug_work);
518 519
519 kobject_init(&q->kobj, &blk_queue_ktype); 520 kobject_init(&q->kobj, &blk_queue_ktype);
520 521
diff --git a/block/blk-settings.c b/block/blk-settings.c
index b21dcdb64151..41392fbe19ff 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -141,8 +141,6 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn)
141 if (q->unplug_delay == 0) 141 if (q->unplug_delay == 0)
142 q->unplug_delay = 1; 142 q->unplug_delay = 1;
143 143
144 INIT_WORK(&q->unplug_work, blk_unplug_work);
145
146 q->unplug_timer.function = blk_unplug_timeout; 144 q->unplug_timer.function = blk_unplug_timeout;
147 q->unplug_timer.data = (unsigned long)q; 145 q->unplug_timer.data = (unsigned long)q;
148 146