Kobject: convert block/ll_rw_blk.c to use kobject_init/add_ng() (d5a379f7) · Commits · 戴 / test

This converts the code to use the new kobject functions, cleaning up the logic in doing so. Cc: Jens Axboe <axboe@kernel.dk> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

block/ll_rw_blk.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -1862,9 +1862,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)

		init_timer(&q->unplug_timer);

		kobject_set_name(&q->kobj, "%s", "queue");
		q->kobj.ktype = &queue_ktype;
		kobject_init(&q->kobj);
		kobject_init_ng(&q->kobj, &queue_ktype);

		mutex_init(&q->sysfs_lock);

		@@ -4182,9 +4180,8 @@ int blk_register_queue(struct gendisk *disk)
		if (!q \|\| !q->request_fn)
		return -ENXIO;

		q->kobj.parent = kobject_get(&disk->dev.kobj);

		ret = kobject_add(&q->kobj);
		ret = kobject_add_ng(&q->kobj, kobject_get(&disk->dev.kobj),
		"%s", "queue");
		if (ret < 0)
		return ret;

Admin message