Commit ed5302d3 authored by Liu Yuan's avatar Liu Yuan Committed by Jens Axboe
Browse files

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: stable@kernel.org
Signed-off-by: default avatarLiu Yuan <tailai.ly@taobao.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent d350e6b6

block/blk-sysfs.c

+3 −1
Original line number Diff line number Diff line
@@ -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);