From 6dfa575b0d91298c85839ed8d6853650b5e22682 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Sat, 10 Sep 2005 14:17:10 +0200 Subject: [PATCH] --- yaml --- r: 8425 b: refs/heads/master c: 35797132b311b3b7d4add48393b0a03f3566cbc1 h: refs/heads/master i: 8423: 7c3a6dd8559e4e4648e298adfee71fe50391114e v: v3 --- [refs] | 2 +- trunk/drivers/block/cfq-iosched.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 48cba024810d..234615bfce21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31139971b3dc9fbb2e8a8572fb81e6e8470f363a +refs/heads/master: 35797132b311b3b7d4add48393b0a03f3566cbc1 diff --git a/trunk/drivers/block/cfq-iosched.c b/trunk/drivers/block/cfq-iosched.c index 30c0903c7cdd..cd056e7e64ec 100644 --- a/trunk/drivers/block/cfq-iosched.c +++ b/trunk/drivers/block/cfq-iosched.c @@ -2260,6 +2260,8 @@ static void cfq_put_cfqd(struct cfq_data *cfqd) if (!atomic_dec_and_test(&cfqd->ref)) return; + blk_put_queue(q); + cfq_shutdown_timer_wq(cfqd); q->elevator->elevator_data = NULL; @@ -2316,6 +2318,7 @@ static int cfq_init_queue(request_queue_t *q, elevator_t *e) e->elevator_data = cfqd; cfqd->queue = q; + atomic_inc(&q->refcnt); cfqd->max_queued = q->nr_requests / 4; q->nr_batching = cfq_queued;