Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[~andy/linux] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index 03d40360ff1be9682f4c192fec63e45b0d9e33fd..b52e9f4ef3719f58c8217deb5e26bdfd59ebaeb9 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -308,6 +308,19 @@ int kobject_rename(struct kobject * kobj, const char *new_name)
        if (!kobj->parent)
                return -EINVAL;
 
+       /* see if this name is already in use */
+       if (kobj->kset) {
+               struct kobject *temp_kobj;
+               temp_kobj = kset_find_obj(kobj->kset, new_name);
+               if (temp_kobj) {
+                       printk(KERN_WARNING "kobject '%s' cannot be renamed "
+                              "to '%s' as '%s' is already in existence.\n",
+                              kobject_name(kobj), new_name, new_name);
+                       kobject_put(temp_kobj);
+                       return -EINVAL;
+               }
+       }
+
        devpath = kobject_get_path(kobj, GFP_KERNEL);
        if (!devpath) {
                error = -ENOMEM;