aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysfs/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/sysfs/file.c')
-rw-r--r--fs/sysfs/file.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index ea0e494d7d58..33bb3406dc49 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -397,6 +397,7 @@ int sysfs_add_file(struct sysfs_dirent *dir_sd, const struct attribute *attr,
397 umode_t mode = (attr->mode & S_IALLUGO) | S_IFREG; 397 umode_t mode = (attr->mode & S_IALLUGO) | S_IFREG;
398 struct sysfs_addrm_cxt acxt; 398 struct sysfs_addrm_cxt acxt;
399 struct sysfs_dirent *sd; 399 struct sysfs_dirent *sd;
400 int rc;
400 401
401 sd = sysfs_new_dirent(attr->name, mode, type); 402 sd = sysfs_new_dirent(attr->name, mode, type);
402 if (!sd) 403 if (!sd)
@@ -404,16 +405,13 @@ int sysfs_add_file(struct sysfs_dirent *dir_sd, const struct attribute *attr,
404 sd->s_elem.attr.attr = (void *)attr; 405 sd->s_elem.attr.attr = (void *)attr;
405 406
406 sysfs_addrm_start(&acxt, dir_sd); 407 sysfs_addrm_start(&acxt, dir_sd);
408 rc = sysfs_add_one(&acxt, sd);
409 sysfs_addrm_finish(&acxt);
407 410
408 if (!sysfs_find_dirent(dir_sd, attr->name)) 411 if (rc)
409 sysfs_add_one(&acxt, sd);
410
411 if (!sysfs_addrm_finish(&acxt)) {
412 sysfs_put(sd); 412 sysfs_put(sd);
413 return -EEXIST;
414 }
415 413
416 return 0; 414 return rc;
417} 415}
418 416
419 417