From 686e31c07ad7dff59f01bbb42339c3f310fde770 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Mon, 31 Oct 2005 13:51:33 +0100
Subject: [PATCH] --- yaml --- r: 11983 b: refs/heads/master c:
 4fc207419d95e0e16fdc78e2f48f7c0b3640ffe5 h: refs/heads/master i:   11981:
 b473a30b25d107c56c472917c3bc6500208f00c4   11979:
 7a476b31c37a870fd109dca373729dbf441626ff   11975:
 30bc3aabfb5bf8bc97bd2cc3151f7a59471ca147   11967:
 44a80c55a3a2cf05c78b48ab07c5556af7988d19 v: v3

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

diff --git a/[refs] b/[refs]
index 1722aa29f5cd..1ad3cd499af6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd05e42fa86e37b14f8169bbad8d334e2e8d4881
+refs/heads/master: 4fc207419d95e0e16fdc78e2f48f7c0b3640ffe5
diff --git a/trunk/drivers/block/cfq-iosched.c b/trunk/drivers/block/cfq-iosched.c
index 5281f8e70510..ecacca9c877e 100644
--- a/trunk/drivers/block/cfq-iosched.c
+++ b/trunk/drivers/block/cfq-iosched.c
@@ -2059,10 +2059,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;
+	blk_put_queue(q);
 
 	mempool_destroy(cfqd->crq_pool);
 	kfree(cfqd->crq_hash);