commit: ed5302d3c25006a9edc7a7fbea97a30483f89ef7 From: Liu Yuan <[email protected]> Date: Tue, 19 Apr 2011 13:47:58 +0200 Subject: [PATCH] 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: [email protected] Signed-off-by: Liu Yuan <[email protected]> Signed-off-by: Jens Axboe <[email protected]> --- block/blk-sysfs.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 6d73512..5d696ad 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); _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
