Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 13:58:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Liu Yuan 2011-04-19 13:47:58 +02:00 committed by Jens Axboe
parent d350e6b6e8
commit ed5302d3c2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/blk-sysfs.c
View File

@ -508,8 +508,10 @@ int blk_register_queue(struct gendisk *disk)
return ret; return ret;
ret = kobject_add(&q->kobj, kobject_get(&dev->kobj), "%s", "queue"); ret = kobject_add(&q->kobj, kobject_get(&dev->kobj), "%s", "queue");
if (ret < 0) if (ret < 0) {
blk_trace_remove_sysfs(dev);
return ret; return ret;
}
kobject_uevent(&q->kobj, KOBJ_ADD); kobject_uevent(&q->kobj, KOBJ_ADD);