---

yaml --- r: 21119 b: refs/heads/master c: 25975f8 h: refs/heads/master i: 21117: fd46620 21115: 6970196 21111: 411fe00 21103: 7396c53 21087: 208165a 21055: e73c900 20991: d2687a6 v: v3
git-mirror · Mar 18, 2006 · f58ddc3 · f58ddc3
1 parent 21eabc4
commit f58ddc3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9ff41879364cfca7c15abc20ae398e35de3f883
+refs/heads/master: 25975f863b0fd42c58109e253e7a4c65d9fdaf48
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -2121,13 +2121,10 @@ static void cfq_shutdown_timer_wq(struct cfq_data *cfqd)
 
 static void cfq_put_cfqd(struct cfq_data *cfqd)
 {
-	request_queue_t *q = cfqd->queue;
-
 	if (!atomic_dec_and_test(&cfqd->ref))
 		return;
 
 	cfq_shutdown_timer_wq(cfqd);
-	blk_put_queue(q);
 
 	mempool_destroy(cfqd->crq_pool);
 	kfree(cfqd->crq_hash);
@@ -2205,7 +2202,6 @@ 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;