diff options
| author | Tejun Heo <htejun@gmail.com> | 2007-08-02 21:38:03 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 14:51:04 -0700 |
| commit | 23dc279950a056c33a14d09cf759f5173d41abd9 (patch) | |
| tree | 852f8cc24c24988717dbae8f98da999ff27755fa /fs/sysfs/file.c | |
| parent | 41fc1c27452e041a18e5141b8203ee0ea72bc483 (diff) | |
| download | op-kernel-dev-23dc279950a056c33a14d09cf759f5173d41abd9.zip op-kernel-dev-23dc279950a056c33a14d09cf759f5173d41abd9.tar.gz | |
sysfs: make sysfs_add_one() automatically check for duplicate entry
Make sysfs_add_one() check for duplicate entry and return -EEXIST if
such entry exists. This simplifies node addition code a bit.
This patch doesn't introduce any noticeable behavior change.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/sysfs/file.c')
| -rw-r--r-- | fs/sysfs/file.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index ea0e494..33bb340 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, umode_t mode = (attr->mode & S_IALLUGO) | S_IFREG; struct sysfs_addrm_cxt acxt; struct sysfs_dirent *sd; + int rc; sd = sysfs_new_dirent(attr->name, mode, type); if (!sd) @@ -404,16 +405,13 @@ int sysfs_add_file(struct sysfs_dirent *dir_sd, const struct attribute *attr, sd->s_elem.attr.attr = (void *)attr; sysfs_addrm_start(&acxt, dir_sd); + rc = sysfs_add_one(&acxt, sd); + sysfs_addrm_finish(&acxt); - if (!sysfs_find_dirent(dir_sd, attr->name)) - sysfs_add_one(&acxt, sd); - - if (!sysfs_addrm_finish(&acxt)) { + if (rc) sysfs_put(sd); - return -EEXIST; - } - return 0; + return rc; } |
