Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3830c62f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Kobject: change drivers/md/md.c to use kobject_init_and_add 



Stop using kobject_register, as this way we can control the sending of
the uevent properly, after everything is properly initialized.

Cc: Neil Brown <neilb@suse.de>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c199790a

drivers/md/md.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -3054,6 +3054,7 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data) 
	int partitioned = (MAJOR(dev) != MD_MAJOR);

	int partitioned = (MAJOR(dev) != MD_MAJOR);

	int shift = partitioned ? MdpMinorShift : 0;

	int shift = partitioned ? MdpMinorShift : 0;

	int unit = MINOR(dev) >> shift;

	int unit = MINOR(dev) >> shift;

	int error;





	if (!mddev)

	if (!mddev)

		return NULL;

		return NULL;
@@ -3082,12 +3083,13 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data) 
	add_disk(disk);

	add_disk(disk);

	mddev->gendisk = disk;

	mddev->gendisk = disk;

	mutex_unlock(&disks_mutex);

	mutex_unlock(&disks_mutex);

	mddev->kobj.parent = &disk->kobj;

	error = kobject_init_and_add(&mddev->kobj, &md_ktype, &disk->kobj,

	kobject_set_name(&mddev->kobj, "%s", "md");

				     "%s", "md");

	mddev->kobj.ktype = &md_ktype;

	if (error)

	if (kobject_register(&mddev->kobj))

		printk(KERN_WARNING "md: cannot register %s/md - name in use\n",

		printk(KERN_WARNING "md: cannot register %s/md - name in use\n",

		       disk->disk_name);

		       disk->disk_name);

	else

		kobject_uevent(&mddev->kobj, KOBJ_ADD);

	return NULL;

	return NULL;

}

}