1 files changed, 61 insertions, 12 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index 7ce6dc138e90..c2917ffe8bf1 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -44,11 +44,11 @@ static int populate_dir(struct kobject * kobj)
         return error;
 }
 
-static int create_dir(struct kobject * kobj)
+static int create_dir(struct kobject * kobj, struct dentry *shadow_parent)
 {
         int error = 0;
         if (kobject_name(kobj)) {
-                error = sysfs_create_dir(kobj);
+                error = sysfs_create_dir(kobj, shadow_parent);
                 if (!error) {
                         if ((error = populate_dir(kobj)))
                                 sysfs_remove_dir(kobj);
@@ -126,6 +126,8 @@ EXPORT_SYMBOL_GPL(kobject_get_path);
  */
 void kobject_init(struct kobject * kobj)
 {
+        if (!kobj)
+                return;
         kref_init(&kobj->kref);
         INIT_LIST_HEAD(&kobj->entry);
         init_waitqueue_head(&kobj->poll);
@@ -156,9 +158,10 @@ static void unlink(struct kobject * kobj)
 /**
  *      kobject_add - add an object to the hierarchy.
  *      @kobj:  object.
+ *      @shadow_parent: sysfs directory to add to.
  */
 
-int kobject_add(struct kobject * kobj)
+int kobject_shadow_add(struct kobject * kobj, struct dentry *shadow_parent)
 {
         int error = 0;
         struct kobject * parent;
@@ -189,12 +192,11 @@ int kobject_add(struct kobject * kobj)
         }
         kobj->parent = parent;
 
-        error = create_dir(kobj);
+        error = create_dir(kobj, shadow_parent);
         if (error) {
                 /* unlink does the kobject_put() for us */
                 unlink(kobj);
-                if (parent)
-                        kobject_put(parent);
+                kobject_put(parent);
 
                 /* be noisy on error issues */
                 if (error == -EEXIST)
@@ -211,6 +213,15 @@ int kobject_add(struct kobject * kobj)
         return error;
 }
 
+/**
+ *      kobject_add - add an object to the hierarchy.
+ *      @kobj:  object.
+ */
+int kobject_add(struct kobject * kobj)
+{
+        return kobject_shadow_add(kobj, NULL);
+}
+
 
 /**
  *      kobject_register - initialize and add an object.
@@ -303,7 +314,29 @@ int kobject_rename(struct kobject * kobj, const char *new_name)
         kobj = kobject_get(kobj);
         if (!kobj)
                 return -EINVAL;
-        error = sysfs_rename_dir(kobj, new_name);
+        if (!kobj->parent)
+                return -EINVAL;
+        error = sysfs_rename_dir(kobj, kobj->parent->dentry, new_name);
+        kobject_put(kobj);
+
+        return error;
+}
+
+/**
+ *      kobject_rename - change the name of an object
+ *      @kobj:  object in question.
+ *      @new_name: object's new name
+ */
+
+int kobject_shadow_rename(struct kobject * kobj, struct dentry *new_parent,
+                          const char *new_name)
+{
+        int error = 0;
+
+        kobj = kobject_get(kobj);
+        if (!kobj)
+                return -EINVAL;
+        error = sysfs_rename_dir(kobj, new_parent, new_name);
         kobject_put(kobj);
 
         return error;
@@ -312,7 +345,7 @@ int kobject_rename(struct kobject * kobj, const char *new_name)
 /**
  *      kobject_move - move object to another parent
  *      @kobj:  object in question.
- *      @new_parent: object's new parent
+ *      @new_parent: object's new parent (can be NULL)
  */
 
 int kobject_move(struct kobject *kobj, struct kobject *new_parent)
@@ -328,8 +361,8 @@ int kobject_move(struct kobject *kobj, struct kobject *new_parent)
                 return -EINVAL;
         new_parent = kobject_get(new_parent);
         if (!new_parent) {
-                error = -EINVAL;
-                goto out;
+                if (kobj->kset)
+                        new_parent = kobject_get(&kobj->kset->kobj);
         }
         /* old object path */
         devpath = kobject_get_path(kobj, GFP_KERNEL);
@@ -366,6 +399,8 @@ out:
 
 void kobject_del(struct kobject * kobj)
 {
+        if (!kobj)
+                return;
         sysfs_remove_dir(kobj);
         unlink(kobj);
 }
@@ -377,6 +412,8 @@ void kobject_del(struct kobject * kobj)
 
 void kobject_unregister(struct kobject * kobj)
 {
+        if (!kobj)
+                return;
         pr_debug("kobject %s: unregistering\n",kobject_name(kobj));
         kobject_uevent(kobj, KOBJ_REMOVE);
         kobject_del(kobj);
@@ -414,8 +451,7 @@ void kobject_cleanup(struct kobject * kobj)
                 t->release(kobj);
         if (s)
                 kset_put(s);
-        if (parent) 
-                kobject_put(parent);
+        kobject_put(parent);
 }
 
 static void kobject_release(struct kref *kref)
@@ -523,6 +559,8 @@ int kset_add(struct kset * k)
 
 int kset_register(struct kset * k)
 {
+        if (!k)
+                return -EINVAL;
         kset_init(k);
         return kset_add(k);
 }
@@ -535,6 +573,8 @@ int kset_register(struct kset * k)
 
 void kset_unregister(struct kset * k)
 {
+        if (!k)
+                return;
         kobject_unregister(&k->kobj);
 }
 
@@ -586,6 +626,9 @@ int subsystem_register(struct subsystem * s)
 {
         int error;
 
+        if (!s)
+                return -EINVAL;
+
         subsystem_init(s);
         pr_debug("subsystem %s: registering\n",s->kset.kobj.name);
 
@@ -598,6 +641,8 @@ int subsystem_register(struct subsystem * s)
 
 void subsystem_unregister(struct subsystem * s)
 {
+        if (!s)
+                return;
         pr_debug("subsystem %s: unregistering\n",s->kset.kobj.name);
         kset_unregister(&s->kset);
 }
@@ -612,6 +657,10 @@ void subsystem_unregister(struct subsystem * s)
 int subsys_create_file(struct subsystem * s, struct subsys_attribute * a)
 {
         int error = 0;
+
+        if (!s || !a)
+                return -EINVAL;
+
         if (subsys_get(s)) {
                 error = sysfs_create_file(&s->kset.kobj,&a->attr);
                 subsys_put(s);