Messages in this thread Patch in this message | | | Date | Fri, 29 Apr 2011 11:55:27 -0700 | From | Greg KH <> | Subject | [04/55] block, blk-sysfs: Fix an err return path in blk_register_queue() |
| |
2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------
From: Liu Yuan <tailai.ly@taobao.com>
commit ed5302d3c25006a9edc7a7fbea97a30483f89ef7 upstream.
We do not call blk_trace_remove_sysfs() in err return path if kobject_add() fails. This path fixes it.
Signed-off-by: Liu Yuan <tailai.ly@taobao.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- block/blk-sysfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
--- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -511,8 +511,10 @@ int blk_register_queue(struct gendisk *d 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);
| |