* [PATCH] block, blk-sysfs: Fix an err return path in blk_register_queue()
@ 2011-04-19 8:17 Liu Yuan
2011-04-19 11:51 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Liu Yuan @ 2011-04-19 8:17 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-kernel
From: Liu Yuan <tailai.ly@taobao.com>
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] block, blk-sysfs: Fix an err return path in blk_register_queue()
2011-04-19 8:17 [PATCH] block, blk-sysfs: Fix an err return path in blk_register_queue() Liu Yuan
@ 2011-04-19 11:51 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2011-04-19 11:51 UTC (permalink / raw)
To: Liu Yuan; +Cc: linux-kernel
On 2011-04-19 10:17, Liu Yuan wrote:
> From: Liu Yuan <tailai.ly@taobao.com>
>
> We do not call blk_trace_remove_sysfs() in err return path
> if kobject_add() fails. This path fixes it.
Thanks, applied.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-19 11:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-19 8:17 [PATCH] block, blk-sysfs: Fix an err return path in blk_register_queue() Liu Yuan
2011-04-19 11:51 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.