From ef66d3ce0c0fd6a5a1c4f95678fc02b1e4c7b055 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Thu, 16 Oct 2008 13:44:57 +0200 Subject: [PATCH] --- yaml --- r: 115490 b: refs/heads/master c: 713ada9ba94f2ad874cffd074b83e3dc681ca82f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 1 + trunk/block/blk-settings.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6a92fa15854b..834f3b0b67c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0997f1c5fec0b540784611036d458a84a1f7029a +refs/heads/master: 713ada9ba94f2ad874cffd074b83e3dc681ca82f diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index 8517264eb71e..fcbd56dd41fa 100644 --- a/trunk/block/blk-core.c +++ b/trunk/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/trunk/block/blk-settings.c b/trunk/block/blk-settings.c index b21dcdb64151..41392fbe19ff 100644 --- a/trunk/block/blk-settings.c +++ b/trunk/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;