diff options
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-emc.c | 2 | ||||
| -rw-r--r-- | drivers/md/md.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/md/dm-emc.c b/drivers/md/dm-emc.c index a2191a4..3425172 100644 --- a/drivers/md/dm-emc.c +++ b/drivers/md/dm-emc.c @@ -54,8 +54,6 @@ static void emc_endio(struct bio *bio, int error) /* request is freed in block layer */ free_bio(bio); - - return 0; } static struct bio *get_failover_bio(struct dm_path *path, unsigned data_size) diff --git a/drivers/md/md.c b/drivers/md/md.c index e8f102e..acf1b81 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -3076,8 +3076,7 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data) mddev->gendisk = disk; mutex_unlock(&disks_mutex); mddev->kobj.parent = &disk->kobj; - mddev->kobj.k_name = NULL; - snprintf(mddev->kobj.name, KOBJ_NAME_LEN, "%s", "md"); + kobject_set_name(&mddev->kobj, "%s", "md"); mddev->kobj.ktype = &md_ktype; if (kobject_register(&mddev->kobj)) printk(KERN_WARNING "md: cannot register %s/md - name in use\n", |