lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sysfs: Removed dup_name entirely in sysfs_rename

Browse Source 
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>
This commit is contained in:
Sasikantha babu
2012-05-03 02:26:14 +05:30
committed by Greg Kroah-Hartman
parent eb1574270a
commit b4eafca113
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/sysfs/dir.c
View File

@@ -858,7 +858,6 @@ int sysfs_rename(struct sysfs_dirent *sd,
struct sysfs_dirent *new_parent_sd, const void *new_ns, struct sysfs_dirent *new_parent_sd, const void *new_ns,
const char *new_name) const char *new_name)
{ {
const char *dup_name = NULL;
int error; int error;
mutex_lock(&sysfs_mutex); mutex_lock(&sysfs_mutex);
@@ -875,11 +874,11 @@ int sysfs_rename(struct sysfs_dirent *sd,
/* rename sysfs_dirent */ /* rename sysfs_dirent */
if (strcmp(sd->s_name, new_name) != 0) { if (strcmp(sd->s_name, new_name) != 0) {
error = -ENOMEM; error = -ENOMEM;
new_name = dup_name = kstrdup(new_name, GFP_KERNEL); new_name = kstrdup(new_name, GFP_KERNEL);
if (!new_name) if (!new_name)
goto out; goto out;
dup_name = sd->s_name; kfree(sd->s_name);
sd->s_name = new_name; sd->s_name = new_name;
} }
@@ -895,7 +894,6 @@ int sysfs_rename(struct sysfs_dirent *sd,
error = 0; error = 0;
out: out:
mutex_unlock(&sysfs_mutex); mutex_unlock(&sysfs_mutex);
kfree(dup_name);
return error; return error;
} }