Commit 060f131e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove a superflous queue kobject reference 



kobject_add already adds a reference to the parent that is dropped
on deletion, so don't bother grabbing another one.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220628171850.1313069-3-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cc5c516d

block/blk-sysfs.c

+1 −5
Original line number Diff line number Diff line
@@ -812,14 +812,13 @@ int blk_register_queue(struct gendisk *disk) 


	mutex_lock(&q->sysfs_dir_lock);



	ret = kobject_add(&q->kobj, kobject_get(&dev->kobj), "%s", "queue");

	ret = kobject_add(&q->kobj, &dev->kobj, "%s", "queue");

	if (ret < 0)

		goto unlock;



	ret = sysfs_create_group(&q->kobj, &queue_attr_group);

	if (ret) {

		kobject_del(&q->kobj);

		kobject_put(&dev->kobj);

		goto unlock;

	}
@@ -883,7 +882,6 @@ int blk_register_queue(struct gendisk *disk) 
	mutex_unlock(&q->sysfs_lock);

	mutex_unlock(&q->sysfs_dir_lock);

	kobject_del(&q->kobj);

	kobject_put(&dev->kobj);



	return ret;

}
@@ -941,6 +939,4 @@ void blk_unregister_queue(struct gendisk *disk) 
	q->sched_debugfs_dir = NULL;

	q->rqos_debugfs_dir = NULL;

	mutex_unlock(&q->debugfs_mutex);



	kobject_put(&disk_to_dev(disk)->kobj);

}