diff options
Diffstat (limited to 'fs/sysfs')
-rw-r--r-- | fs/sysfs/dir.c | 6 |
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) | |||
829 | if (!new_dentry) | 829 | if (!new_dentry) |
830 | goto out_unlock; | 830 | goto out_unlock; |
831 | 831 | ||
832 | /* rename kobject and sysfs_dirent */ | 832 | /* rename sysfs_dirent */ |
833 | error = -ENOMEM; | 833 | error = -ENOMEM; |
834 | new_name = dup_name = kstrdup(new_name, GFP_KERNEL); | 834 | new_name = dup_name = kstrdup(new_name, GFP_KERNEL); |
835 | if (!new_name) | 835 | if (!new_name) |
836 | goto out_unlock; | 836 | goto out_unlock; |
837 | 837 | ||
838 | error = kobject_set_name(kobj, "%s", new_name); | ||
839 | if (error) | ||
840 | goto out_unlock; | ||
841 | |||
842 | dup_name = sd->s_name; | 838 | dup_name = sd->s_name; |
843 | sd->s_name = new_name; | 839 | sd->s_name = new_name; |
844 | 840 | ||