diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2008-10-16 13:44:57 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-10-17 08:46:57 +0200 |
| commit | 713ada9ba94f2ad874cffd074b83e3dc681ca82f (patch) | |
| tree | e94cae4cb7d6d8bee404feb869bceee74b402f93 /block | |
| parent | 0997f1c5fec0b540784611036d458a84a1f7029a (diff) | |
| download | kernel_samsung_smdk4412-713ada9ba94f2ad874cffd074b83e3dc681ca82f.zip kernel_samsung_smdk4412-713ada9ba94f2ad874cffd074b83e3dc681ca82f.tar.gz kernel_samsung_smdk4412-713ada9ba94f2ad874cffd074b83e3dc681ca82f.tar.bz2 | |
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.c | 1 | ||||
| -rw-r--r-- | block/blk-settings.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 8517264..fcbd56d 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) init_timer(&q->unplug_timer); setup_timer(&q->timeout, blk_rq_timed_out_timer, (unsigned long) q); INIT_LIST_HEAD(&q->timeout_list); + INIT_WORK(&q->unplug_work, blk_unplug_work); kobject_init(&q->kobj, &blk_queue_ktype); diff --git a/block/blk-settings.c b/block/blk-settings.c index b21dcdb..41392fb 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) if (q->unplug_delay == 0) q->unplug_delay = 1; - INIT_WORK(&q->unplug_work, blk_unplug_work); - q->unplug_timer.function = blk_unplug_timeout; q->unplug_timer.data = (unsigned long)q; |