aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-10-24 19:52:31 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-31 00:52:33 -0400
commit34358c26a2c96b2a068dc44e0ac602106a466bce (patch)
tree36820739660152337e8e6fcbf4f21d97d1525208
parentfcd239d3d5575e5cc63aab5c33cf6dc66904f6d6 (diff)
kobject: check for duplicate names in kobject_rename
This should catch any duplicate names before we try to tell sysfs to rename the object. This happens a lot with older versions of udev and the network rename scripts. Cc: David Miller <davem@davemloft.net> Cc: Kay Sievers <kay.sievers@vrfy.org> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: Tejun Heo <htejun@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--lib/kobject.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/kobject.c b/lib/kobject.c
index 03d40360ff1b..a7e3bf4d3c70 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -308,6 +308,19 @@ int kobject_rename(struct kobject * kobj, const char *new_name)
308 if (!kobj->parent) 308 if (!kobj->parent)
309 return -EINVAL; 309 return -EINVAL;
310 310
311 /* see if this name is already in use */
312 if (kobj->kset) {
313 struct kobject *temp_kobj;
314 temp_kobj = kset_find_obj(kobj->kset, new_name);
315 if (temp_kobj) {
316 printk(KERN_WARNING "kobject '%s' can not be renamed "
317 "to '%s' as '%s' is already in existance.\n",
318 kobject_name(kobj), new_name, new_name);
319 kobject_put(temp_kobj);
320 return -EINVAL;
321 }
322 }
323
311 devpath = kobject_get_path(kobj, GFP_KERNEL); 324 devpath = kobject_get_path(kobj, GFP_KERNEL);
312 if (!devpath) { 325 if (!devpath) {
313 error = -ENOMEM; 326 error = -ENOMEM;