---

yaml
---
r: 72925
b: refs/heads/master
c: 34358c2
h: refs/heads/master
i:
  72923: 2c049e9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcd239d3d5575e5cc63aab5c33cf6dc66904f6d6
+refs/heads/master: 34358c26a2c96b2a068dc44e0ac602106a466bce

trunk/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' can not be renamed "
+			       "to '%s' as '%s' is already in existance.\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;