From: Liu Yuan <tailai.ly@taobao.com>
Date: Tue, 19 Apr 2011 11:47:58 +0000 (+0200)
Subject: block, blk-sysfs: Fix an err return path in blk_register_queue()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ed5302d3c25006a9edc7a7fbea97a30483f89ef7;p=openwrt%2Fstaging%2Fblogic.git

block, blk-sysfs: Fix an err return path in blk_register_queue()

We do not call blk_trace_remove_sysfs() in err return path
if kobject_add() fails. This path fixes it.

Cc: stable@kernel.org
Signed-off-by: Liu Yuan <tailai.ly@taobao.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 6d735122bc59..5d696adbc4dc 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -508,8 +508,10 @@ int blk_register_queue(struct gendisk *disk)
 		return ret;
 
 	ret = kobject_add(&q->kobj, kobject_get(&dev->kobj), "%s", "queue");
-	if (ret < 0)
+	if (ret < 0) {
+		blk_trace_remove_sysfs(dev);
 		return ret;
+	}
 
 	kobject_uevent(&q->kobj, KOBJ_ADD);