Commit 9c791977 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds

[PATCH] md: fix ref-counting problems with kobjects in md

Thanks Greg.

Cc:  Greg KH <greg@kroah.com>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d6065f7b
......@@ -805,7 +805,11 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev)
if (fixdesc & (1<<rdev2->desc_nr)) {
snprintf(rdev2->kobj.name, KOBJ_NAME_LEN, "dev%d",
rdev2->desc_nr);
/* kobject_add gets a ref on the parent, so
* we have to drop the one we already have
*/
kobject_add(&rdev2->kobj);
kobject_put(rdev->kobj.parent);
sysfs_create_link(&rdev2->kobj,
&rdev2->bdev->bd_disk->kobj,
"block");
......@@ -1178,7 +1182,7 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
rdev->kobj.k_name = NULL;
snprintf(rdev->kobj.name, KOBJ_NAME_LEN, "dev%d", rdev->desc_nr);
rdev->kobj.parent = kobject_get(&mddev->kobj);
rdev->kobj.parent = &mddev->kobj;
kobject_add(&rdev->kobj);
sysfs_create_link(&rdev->kobj, &rdev->bdev->bd_disk->kobj, "block");
......@@ -1864,7 +1868,7 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
add_disk(disk);
mddev->gendisk = disk;
up(&disks_sem);
mddev->kobj.parent = kobject_get(&disk->kobj);
mddev->kobj.parent = &disk->kobj;
mddev->kobj.k_name = NULL;
snprintf(mddev->kobj.name, KOBJ_NAME_LEN, "%s", "md");
mddev->kobj.ktype = &md_ktype;
......
......@@ -1975,7 +1975,7 @@ memory = conf->max_nr_stripes * (sizeof(struct stripe_head) +
}
/* Ok, everything is just fine now */
conf->kobj.parent = kobject_get(&mddev->kobj);
conf->kobj.parent = &mddev->kobj;
strcpy(conf->kobj.name, "raid5");
conf->kobj.ktype = &raid5_ktype;
kobject_register(&conf->kobj);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment