torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

driver core: Implement ns directory support for device classes.

Browse Source 
device_del and device_rename were modified to use
sysfs_delete_link and sysfs_rename_link respectively to ensure
when these operations happen on devices whose classes
are in namespace directories they work properly.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Eric W. Biederman 2010-03-30 11:31:29 -07:00 committed by Greg Kroah-Hartman
parent 746edb7ae8
commit f349cf3473
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/base/core.c
View File

@ -786,7 +786,7 @@ out_device:
out_busid: out_busid:
if (dev->kobj.parent != &dev->class->p->class_subsys.kobj && if (dev->kobj.parent != &dev->class->p->class_subsys.kobj &&
device_is_not_partition(dev)) device_is_not_partition(dev))
sysfs_remove_link(&dev->class->p->class_subsys.kobj, sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj,
dev_name(dev)); dev_name(dev));
#else #else
/* link in the class directory pointing to the device */ /* link in the class directory pointing to the device */
@ -804,7 +804,7 @@ out_busid:
return 0; return 0;
out_busid: out_busid:
sysfs_remove_link(&dev->class->p->class_subsys.kobj, dev_name(dev)); sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj, dev_name(dev));
#endif #endif
out_subsys: out_subsys:
@ -832,13 +832,13 @@ static void device_remove_class_symlinks(struct device *dev)
if (dev->kobj.parent != &dev->class->p->class_subsys.kobj && if (dev->kobj.parent != &dev->class->p->class_subsys.kobj &&
device_is_not_partition(dev)) device_is_not_partition(dev))
sysfs_remove_link(&dev->class->p->class_subsys.kobj, sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj,
dev_name(dev)); dev_name(dev));
#else #else
if (dev->parent && device_is_not_partition(dev)) if (dev->parent && device_is_not_partition(dev))
sysfs_remove_link(&dev->kobj, "device"); sysfs_remove_link(&dev->kobj, "device");
sysfs_remove_link(&dev->class->p->class_subsys.kobj, dev_name(dev)); sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj, dev_name(dev));
#endif #endif
sysfs_remove_link(&dev->kobj, "subsystem"); sysfs_remove_link(&dev->kobj, "subsystem");
@ -1624,6 +1624,14 @@ int device_rename(struct device *dev, char *new_name)
goto out; goto out;
} }
#ifndef CONFIG_SYSFS_DEPRECATED
if (dev->class) {
error = sysfs_rename_link(&dev->class->p->class_subsys.kobj,
&dev->kobj, old_device_name, new_name);
if (error)
goto out;
}
#endif
error = kobject_rename(&dev->kobj, new_name); error = kobject_rename(&dev->kobj, new_name);
if (error) if (error)
goto out; goto out;
@ -1638,11 +1646,6 @@ int device_rename(struct device *dev, char *new_name)
new_class_name); new_class_name);
} }
} }
#else
if (dev->class) {
error = sysfs_rename_link(&dev->class->p->class_subsys.kobj,
&dev->kobj, old_device_name, new_name);
}
#endif #endif
out: out: