Commit 19c38de8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

kobjects: fix up improper use of the kobject name field

A number of different drivers incorrect access the kobject name field
directly.  This is not correct as the name might not be in the array.
Use the proper accessor function instead.
parent 5901d014
...@@ -186,7 +186,7 @@ static elevator_t *elevator_alloc(struct request_queue *q, ...@@ -186,7 +186,7 @@ static elevator_t *elevator_alloc(struct request_queue *q,
eq->ops = &e->ops; eq->ops = &e->ops;
eq->elevator_type = e; eq->elevator_type = e;
kobject_init(&eq->kobj); kobject_init(&eq->kobj);
snprintf(eq->kobj.name, KOBJ_NAME_LEN, "%s", "iosched"); kobject_set_name(&eq->kobj, "%s", "iosched");
eq->kobj.ktype = &elv_ktype; eq->kobj.ktype = &elv_ktype;
mutex_init(&eq->sysfs_lock); mutex_init(&eq->sysfs_lock);
......
...@@ -1854,7 +1854,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) ...@@ -1854,7 +1854,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
init_timer(&q->unplug_timer); init_timer(&q->unplug_timer);
snprintf(q->kobj.name, KOBJ_NAME_LEN, "%s", "queue"); kobject_set_name(&q->kobj, "%s", "queue");
q->kobj.ktype = &queue_ktype; q->kobj.ktype = &queue_ktype;
kobject_init(&q->kobj); kobject_init(&q->kobj);
......
...@@ -194,7 +194,7 @@ int acpi_bus_set_power(acpi_handle handle, int state) ...@@ -194,7 +194,7 @@ int acpi_bus_set_power(acpi_handle handle, int state)
if (!device->flags.power_manageable) { if (!device->flags.power_manageable) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable\n", ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable\n",
device->dev.kobj.name)); kobject_name(&device->dev.kobj)));
return -ENODEV; return -ENODEV;
} }
/* /*
......
...@@ -828,7 +828,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev) ...@@ -828,7 +828,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
/* prepare interface data */ /* prepare interface data */
policy->kobj.parent = &sys_dev->kobj; policy->kobj.parent = &sys_dev->kobj;
policy->kobj.ktype = &ktype_cpufreq; policy->kobj.ktype = &ktype_cpufreq;
strlcpy(policy->kobj.name, "cpufreq", KOBJ_NAME_LEN); kobject_set_name(&policy->kobj, "cpufreq");
ret = kobject_register(&policy->kobj); ret = kobject_register(&policy->kobj);
if (ret) { if (ret) {
......
...@@ -3076,8 +3076,7 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data) ...@@ -3076,8 +3076,7 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
mddev->gendisk = disk; mddev->gendisk = disk;
mutex_unlock(&disks_mutex); mutex_unlock(&disks_mutex);
mddev->kobj.parent = &disk->kobj; mddev->kobj.parent = &disk->kobj;
mddev->kobj.k_name = NULL; kobject_set_name(&mddev->kobj, "%s", "md");
snprintf(mddev->kobj.name, KOBJ_NAME_LEN, "%s", "md");
mddev->kobj.ktype = &md_ktype; mddev->kobj.ktype = &md_ktype;
if (kobject_register(&mddev->kobj)) 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",
......
...@@ -1183,7 +1183,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_ ...@@ -1183,7 +1183,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
pool_count[i], pool_size[i], pool_count[i], pool_size[i],
pool_active[i]); pool_active[i]);
kobj->parent = &dev->dev.kobj; kobj->parent = &dev->dev.kobj;
sprintf(kobj->name, "pool%d", i); kobject_set_name(kobj, "pool%d", i);
kobj->ktype = &ktype_veth_pool; kobj->ktype = &ktype_veth_pool;
kobject_register(kobj); kobject_register(kobj);
} }
......
...@@ -48,7 +48,7 @@ pdev_fixup_irq(struct pci_dev *dev, ...@@ -48,7 +48,7 @@ pdev_fixup_irq(struct pci_dev *dev,
dev->irq = irq; dev->irq = irq;
pr_debug("PCI: fixup irq: (%s) got %d\n", pr_debug("PCI: fixup irq: (%s) got %d\n",
dev->dev.kobj.name, dev->irq); kobject_name(&dev->dev.kobj), dev->irq);
/* Always tell the device, so the driver knows what is /* Always tell the device, so the driver knows what is
the real IRQ to use; the device does not use it. */ the real IRQ to use; the device does not use it. */
......
...@@ -381,10 +381,12 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len, ...@@ -381,10 +381,12 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len,
p->partno = part; p->partno = part;
p->policy = disk->policy; p->policy = disk->policy;
if (isdigit(disk->kobj.name[strlen(disk->kobj.name)-1])) if (isdigit(disk->kobj.k_name[strlen(disk->kobj.k_name)-1]))
snprintf(p->kobj.name,KOBJ_NAME_LEN,"%sp%d",disk->kobj.name,part); kobject_set_name(&p->kobj, "%sp%d",
kobject_name(&disk->kobj), part);
else else
snprintf(p->kobj.name,KOBJ_NAME_LEN,"%s%d",disk->kobj.name,part); kobject_set_name(&p->kobj, "%s%d",
kobject_name(&disk->kobj),part);
p->kobj.parent = &disk->kobj; p->kobj.parent = &disk->kobj;
p->kobj.ktype = &ktype_part; p->kobj.ktype = &ktype_part;
kobject_init(&p->kobj); kobject_init(&p->kobj);
...@@ -477,9 +479,9 @@ void register_disk(struct gendisk *disk) ...@@ -477,9 +479,9 @@ void register_disk(struct gendisk *disk)
struct hd_struct *p; struct hd_struct *p;
int err; int err;
strlcpy(disk->kobj.name,disk->disk_name,KOBJ_NAME_LEN); kobject_set_name(&disk->kobj, "%s", disk->disk_name);
/* ewww... some of these buggers have / in name... */ /* ewww... some of these buggers have / in name... */
s = strchr(disk->kobj.name, '/'); s = strchr(disk->kobj.k_name, '/');
if (s) if (s)
*s = '!'; *s = '!';
if ((err = kobject_add(&disk->kobj))) if ((err = kobject_add(&disk->kobj)))
......
...@@ -1013,7 +1013,7 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj) ...@@ -1013,7 +1013,7 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj)
goto again; goto again;
} }
new_dentry = lookup_one_len(kobj->name, new_parent, strlen(kobj->name)); new_dentry = lookup_one_len(kobject_name(kobj), new_parent, strlen(kobject_name(kobj)));
if (IS_ERR(new_dentry)) { if (IS_ERR(new_dentry)) {
error = PTR_ERR(new_dentry); error = PTR_ERR(new_dentry);
goto out_unlock; goto out_unlock;
......
...@@ -435,7 +435,7 @@ int br_sysfs_addbr(struct net_device *dev) ...@@ -435,7 +435,7 @@ int br_sysfs_addbr(struct net_device *dev)
err = kobject_register(&br->ifobj); err = kobject_register(&br->ifobj);
if (err) { if (err) {
pr_info("%s: can't add kobject (directory) %s/%s\n", pr_info("%s: can't add kobject (directory) %s/%s\n",
__FUNCTION__, dev->name, br->ifobj.name); __FUNCTION__, dev->name, kobject_name(&br->ifobj));
goto out3; goto out3;
} }
return 0; return 0;
......
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