From 411fe002bf1aa32f3cab376a36c5482ae4533eee Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 18 Mar 2006 13:50:00 -0500
Subject: [PATCH] --- yaml --- r: 21111 b: refs/heads/master c:
 8669aafdb5a46a57366dd1540fc475544071a9c9 h: refs/heads/master i:   21109:
 34ce99548e35e60a8a6fb39b629c614ade783731   21107:
 d3442a089d9ca9540f9ab25278b19e43bd9f1383   21103:
 7396c53376129a32667c781c9fd0f3e0595d5ab5 v: v3

---
 [refs]                  |  2 +-
 trunk/block/ll_rw_blk.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7db9572b0045..192c19b80041 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afc847b7ddcf636e524cf5b0de644bd3a9419a8c
+refs/heads/master: 8669aafdb5a46a57366dd1540fc475544071a9c9
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
index 0ef2971a9e82..5fac138a5be1 100644
--- a/trunk/block/ll_rw_blk.c
+++ b/trunk/block/ll_rw_blk.c
@@ -1854,8 +1854,10 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
 		return NULL;
 
 	q->node = node_id;
-	if (blk_init_free_list(q))
-		goto out_init;
+	if (blk_init_free_list(q)) {
+		kmem_cache_free(requestq_cachep, q);
+		return NULL;
+	}
 
 	/*
 	 * if caller didn't supply a lock, they get per-queue locking with
@@ -1891,9 +1893,7 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
 		return q;
 	}
 
-	blk_cleanup_queue(q);
-out_init:
-	kmem_cache_free(requestq_cachep, q);
+	blk_put_queue(q);
 	return NULL;
 }
 EXPORT_SYMBOL(blk_init_queue_node);