Messages in this thread | | | Date | Tue, 12 Jan 2010 11:34:49 -0600 | From | "Serge E. Hallyn" <> | Subject | Re: [PATCH 5/7] driver core: Use sysfs_rename_link in device_rename |
| |
Quoting Eric W. Biederman (ebiederm@xmission.com): > From: Eric W. Biederman <ebiederm@xmission.com> > > Don't open code the renaming of symlinks in sysfs > instead use the new helper function sysfs_rename_link > > Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
> --- > drivers/base/core.c | 18 ++++++------------ > 1 files changed, 6 insertions(+), 12 deletions(-) > > diff --git a/drivers/base/core.c b/drivers/base/core.c > index 2820257..ba66394 100644 > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -1574,22 +1574,16 @@ int device_rename(struct device *dev, char *new_name) > if (old_class_name) { > new_class_name = make_class_name(dev->class->name, &dev->kobj); > if (new_class_name) { > - error = sysfs_create_link_nowarn(&dev->parent->kobj, > - &dev->kobj, > - new_class_name); > - if (error) > - goto out; > - sysfs_remove_link(&dev->parent->kobj, old_class_name); > + error = sysfs_rename_link(&dev->parent->kobj, > + &dev->kobj, > + old_class_name, > + new_class_name); > } > } > #else > if (dev->class) { > - error = sysfs_create_link_nowarn(&dev->class->p->class_subsys.kobj, > - &dev->kobj, dev_name(dev)); > - if (error) > - goto out; > - sysfs_remove_link(&dev->class->p->class_subsys.kobj, > - old_device_name); > + error = sysfs_rename_link(&dev->class->p->class_subsys.kobj, > + &dev->kobj, old_device_name, new_name); > } > #endif > > -- > 1.6.5.2.143.g8cc62
| |