2011-04-19 08:17:28

by Liu Yuan

Subject: [PATCH] block, blk-sysfs: Fix an err return path in blk_register_queue()

From: Liu Yuan <[email protected]>

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 <[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);

--
1.7.1

2011-04-19 11:51:10

by Jens Axboe

Subject: Re: [PATCH] block, blk-sysfs: Fix an err return path in blk_register_queue()

On 2011-04-19 10:17, Liu Yuan wrote:
> From: Liu Yuan <[email protected]>
>
> We do not call blk_trace_remove_sysfs() in err return path
> if kobject_add() fails. This path fixes it.

Thanks, applied.

--
Jens Axboe