kobject: Cleanup kobject_rename and !CONFIG_SYSFS

It finally dawned on me what the clean fix to sysfs_rename_dir
calling kobject_set_name is.  Move the work into kobject_rename
where it belongs.  The callers serialize us anyway so this is
safe.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 1 insertions, 5 deletions

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index c18342641cec..3a05a596e3b4 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -829,16 +829,12 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name)
         if (!new_dentry)
                 goto out_unlock;
 
-        /* rename kobject and sysfs_dirent */
+        /* rename sysfs_dirent */
         error = -ENOMEM;
         new_name = dup_name = kstrdup(new_name, GFP_KERNEL);
         if (!new_name)
                 goto out_unlock;
 
-        error = kobject_set_name(kobj, "%s", new_name);
-        if (error)
-                goto out_unlock;
-
         dup_name = sd->s_name;
         sd->s_name = new_name;