From f58ddc35e81569b1c01ff252d241eeb286a3af82 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 12 Mar 2006 13:45:25 -0500
Subject: [PATCH] --- yaml --- r: 21119 b: refs/heads/master c:
 25975f863b0fd42c58109e253e7a4c65d9fdaf48 h: refs/heads/master i:   21117:
 fd466203825f79aadff355cc372ba8a3d2dcd39b   21115:
 6970196677411383b946fb0e938ee3b9082cb823   21111:
 411fe002bf1aa32f3cab376a36c5482ae4533eee   21103:
 7396c53376129a32667c781c9fd0f3e0595d5ab5   21087:
 208165a7b24e90e1a77f91bc3bcccb0fd8993b9f   21055:
 e73c900282d9196c6f9bc9ff0da7d4f5538e18ce   20991:
 d2687a6199f374786d9e20952407885b26b64d5a v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a188306f597a..2b11b6af3768 100644
--- 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
index 3fc6e505e9c8..521c56d4fdbc 100644
--- 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;