diff options
| author | Sasikantha babu <sasikanth.v19@gmail.com> | 2012-05-03 00:56:14 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-03 01:55:09 +0400 |
| commit | b4eafca1132d6065c2f37a873dbf4e0bb88cb23f (patch) | |
| tree | 5c4ae4434dadebbbc82954227b4028804ac5797d /fs/sysfs/dir.c | |
| parent | eb1574270a6de8fb8d31ffc3b021e30df0afcda3 (diff) | |
| download | linux-b4eafca1132d6065c2f37a873dbf4e0bb88cb23f.tar.xz | |
sysfs: Removed dup_name entirely in sysfs_rename
Since no one using "dup_name", removed it completely in sysfs_rename.
Signed-off-by: Sasikantha babu <sasikanth.v19@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/sysfs/dir.c')
| -rw-r--r-- | fs/sysfs/dir.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index 35a36d39fa2c..24fa995f0312 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -858,7 +858,6 @@ int sysfs_rename(struct sysfs_dirent *sd, struct sysfs_dirent *new_parent_sd, const void *new_ns, const char *new_name) { - const char *dup_name = NULL; int error; mutex_lock(&sysfs_mutex); @@ -875,11 +874,11 @@ int sysfs_rename(struct sysfs_dirent *sd, /* rename sysfs_dirent */ if (strcmp(sd->s_name, new_name) != 0) { error = -ENOMEM; - new_name = dup_name = kstrdup(new_name, GFP_KERNEL); + new_name = kstrdup(new_name, GFP_KERNEL); if (!new_name) goto out; - dup_name = sd->s_name; + kfree(sd->s_name); sd->s_name = new_name; } @@ -895,7 +894,6 @@ int sysfs_rename(struct sysfs_dirent *sd, error = 0; out: mutex_unlock(&sysfs_mutex); - kfree(dup_name); return error; } |