From a2f79ef5c8a7f13ed102f34033bed5a9619a422e Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 19 Apr 2012 16:29:23 -0700
Subject: [PATCH] --- yaml --- r: 309279 b: refs/heads/master c:
 496fb7806d616185a46865a4f3a20ef19dc6c7e3 h: refs/heads/master i:   309277:
 c23d226056652fa34b178ab3f0b071b05065c8b6   309275:
 31232cd24d6ae69d73b69573f79d7ed2d8693314   309271:
 4f4e66cc682037183fdf42fa3cdfff26f576a60d   309263:
 2918dcac7d40f36ed7bb1bc7d51ca61cecb1a657   309247:
 16667435e6776b6345b835d81b816f40854d960e v: v3

---
 [refs]                   |  2 +-
 trunk/block/blk-cgroup.c | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index bbb91a7abc01..888fb4f0d3cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaf7c680682f1999ef2e574f743c45d1674a8b8a
+refs/heads/master: 496fb7806d616185a46865a4f3a20ef19dc6c7e3
diff --git a/trunk/block/blk-cgroup.c b/trunk/block/blk-cgroup.c
index 82283859727e..30a7a9c58b38 100644
--- a/trunk/block/blk-cgroup.c
+++ b/trunk/block/blk-cgroup.c
@@ -174,6 +174,7 @@ static struct blkcg_gq *__blkg_lookup_create(struct blkcg *blkcg,
 	__releases(q->queue_lock) __acquires(q->queue_lock)
 {
 	struct blkcg_gq *blkg;
+	int ret;
 
 	WARN_ON_ONCE(!rcu_read_lock_held());
 	lockdep_assert_held(q->queue_lock);
@@ -186,24 +187,22 @@ static struct blkcg_gq *__blkg_lookup_create(struct blkcg *blkcg,
 	if (!css_tryget(&blkcg->css))
 		return ERR_PTR(-EINVAL);
 
-	/*
-	 * Allocate and initialize.
-	 */
+	/* allocate */
+	ret = -ENOMEM;
 	blkg = blkg_alloc(blkcg, q);
-
-	/* did alloc fail? */
-	if (unlikely(!blkg)) {
-		blkg = ERR_PTR(-ENOMEM);
-		goto out;
-	}
+	if (unlikely(!blkg))
+		goto err_put;
 
 	/* insert */
 	spin_lock(&blkcg->lock);
 	hlist_add_head_rcu(&blkg->blkcg_node, &blkcg->blkg_list);
 	list_add(&blkg->q_node, &q->blkg_list);
 	spin_unlock(&blkcg->lock);
-out:
 	return blkg;
+
+err_put:
+	css_put(&blkcg->css);
+	return ERR_PTR(ret);
 }
 
 struct blkcg_gq *blkg_lookup_create(struct blkcg *blkcg,