markers: fix unregister bug and reenter bug, cleanup

[safe/jmp/linux-2.6] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index fd78740..fbf0ae2 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -164,9 +164,8 @@ static int kobject_add_internal(struct kobject *kobj)
                return -ENOENT;
 
        if (!kobj->name || !kobj->name[0]) {
-               pr_debug("kobject: (%p): attempted to be registered with empty "
+               WARN(1, "kobject: (%p): attempted to be registered with empty "
                         "name!\n", kobj);
-               WARN_ON(1);
                return -EINVAL;
        }
 
@@ -216,22 +215,18 @@ static int kobject_add_internal(struct kobject *kobj)
 static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
                                  va_list vargs)
 {
-       va_list aq;
-       char *name;
+       const char *old_name = kobj->name;
+       char *s;
 
-       va_copy(aq, vargs);
-       name = kvasprintf(GFP_KERNEL, fmt, vargs);
-       va_end(aq);
-
-       if (!name)
+       kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
+       if (!kobj->name)
                return -ENOMEM;
 
-       /* Free the old name, if necessary. */
-       kfree(kobj->name);
-
-       /* Now, set the new name */
-       kobj->name = name;
+       /* ewww... some of these buggers have '/' in the name ... */
+       while ((s = strchr(kobj->name, '/')))
+               s[0] = '!';
 
+       kfree(old_name);
        return 0;
 }
 
@@ -246,12 +241,12 @@ static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
  */
 int kobject_set_name(struct kobject *kobj, const char *fmt, ...)
 {
-       va_list args;
+       va_list vargs;
        int retval;
 
-       va_start(args, fmt);
-       retval = kobject_set_name_vargs(kobj, fmt, args);
-       va_end(args);
+       va_start(vargs, fmt);
+       retval = kobject_set_name_vargs(kobj, fmt, vargs);
+       va_end(vargs);
 
        return retval;
 }
@@ -301,12 +296,9 @@ EXPORT_SYMBOL(kobject_init);
 static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
                            const char *fmt, va_list vargs)
 {
-       va_list aq;
        int retval;
 
-       va_copy(aq, vargs);
-       retval = kobject_set_name_vargs(kobj, fmt, aq);
-       va_end(aq);
+       retval = kobject_set_name_vargs(kobj, fmt, vargs);
        if (retval) {
                printk(KERN_ERR "kobject: can not set name properly!\n");
                return retval;
@@ -451,6 +443,7 @@ out:
 
        return error;
 }
+EXPORT_SYMBOL_GPL(kobject_rename);
 
 /**
  * kobject_move - move object to another parent
@@ -588,12 +581,10 @@ static void kobject_release(struct kref *kref)
 void kobject_put(struct kobject *kobj)
 {
        if (kobj) {
-               if (!kobj->state_initialized) {
-                       printk(KERN_WARNING "kobject: '%s' (%p): is not "
+               if (!kobj->state_initialized)
+                       WARN(1, KERN_WARNING "kobject: '%s' (%p): is not "
                               "initialized, yet kobject_put() is being "
                               "called.\n", kobject_name(kobj), kobj);
-                       WARN_ON(1);
-               }
                kref_put(&kobj->kref, kobject_release);
        }
 }