Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sysfs, kernfs: remove sysfs_add_one()

Browse Source 
sysfs_add_one() is a wrapper around __sysfs_add_one() which prints out
duplicate name warning if __sysfs_add_one() fails with -EEXIST.  The
previous kernfs conversions moved all dup warnings to sysfs interface
functions and sysfs_add_one() doesn't have any user left.

Remove sysfs_add_one() and update __sysfs_add_one() to take its name.

This patch doesn't make any functional changes.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tejun Heo 2013-11-28 14:54:25 -05:00 committed by Greg Kroah-Hartman
parent 496f73944a
commit 2d0cfbec2a
4 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fs/sysfs/dir.c
View File

@ -395,7 +395,7 @@ void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt)
} }
/** /**
* __sysfs_add_one - add sysfs_dirent to parent without warning * sysfs_add_one - add sysfs_dirent to parent without warning
* @acxt: addrm context to use * @acxt: addrm context to use
* @sd: sysfs_dirent to be added * @sd: sysfs_dirent to be added
* @parent_sd: the parent sysfs_dirent to add @sd to * @parent_sd: the parent sysfs_dirent to add @sd to
@ -415,8 +415,8 @@ void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt)
* 0 on success, -EEXIST if entry with the given name already * 0 on success, -EEXIST if entry with the given name already
* exists. * exists.
*/ */
int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd, int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd,
struct sysfs_dirent *parent_sd) struct sysfs_dirent *parent_sd)
{ {
bool has_ns = parent_sd->s_flags & SYSFS_FLAG_NS; bool has_ns = parent_sd->s_flags & SYSFS_FLAG_NS;
struct sysfs_inode_attrs *ps_iattr; struct sysfs_inode_attrs *ps_iattr;
@ -487,39 +487,6 @@ void sysfs_warn_dup(struct sysfs_dirent *parent, const char *name)
kfree(path); kfree(path);
} }
/**
* sysfs_add_one - add sysfs_dirent to parent
* @acxt: addrm context to use
* @sd: sysfs_dirent to be added
* @parent_sd: the parent sysfs_dirent to add @sd to
*
* Get @parent_sd and set @sd->s_parent to it and increment nlink of
* the parent inode if @sd is a directory and link into the children
* list of the parent.
*
* This function should be called between calls to
* sysfs_addrm_start() and sysfs_addrm_finish() and should be
* passed the same @acxt as passed to sysfs_addrm_start().
*
* LOCKING:
* Determined by sysfs_addrm_start().
*
* RETURNS:
* 0 on success, -EEXIST if entry with the given name already
* exists.
*/
int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd,
struct sysfs_dirent *parent_sd)
{
int ret;
ret = __sysfs_add_one(acxt, sd, parent_sd);
if (ret == -EEXIST)
sysfs_warn_dup(parent_sd, sd->s_name);
return ret;
}
/** /**
* sysfs_remove_one - remove sysfs_dirent from parent * sysfs_remove_one - remove sysfs_dirent from parent
* @acxt: addrm context to use * @acxt: addrm context to use
@ -694,7 +661,7 @@ struct sysfs_dirent *kernfs_create_dir_ns(struct sysfs_dirent *parent,
/* link in */ /* link in */
sysfs_addrm_start(&acxt); sysfs_addrm_start(&acxt);
rc = __sysfs_add_one(&acxt, sd, parent); rc = sysfs_add_one(&acxt, sd, parent);
sysfs_addrm_finish(&acxt); sysfs_addrm_finish(&acxt);
if (!rc) if (!rc)

2
fs/sysfs/file.c
View File

@ -1007,7 +1007,7 @@ struct sysfs_dirent *kernfs_create_file_ns(struct sysfs_dirent *parent,
sd->s_flags |= SYSFS_FLAG_HAS_MMAP; sd->s_flags |= SYSFS_FLAG_HAS_MMAP;
sysfs_addrm_start(&acxt); sysfs_addrm_start(&acxt);
rc = __sysfs_add_one(&acxt, sd, parent); rc = sysfs_add_one(&acxt, sd, parent);
sysfs_addrm_finish(&acxt); sysfs_addrm_finish(&acxt);
if (rc) { if (rc) {

2
fs/sysfs/symlink.c
View File

@ -47,7 +47,7 @@ struct sysfs_dirent *kernfs_create_link(struct sysfs_dirent *parent,
sysfs_get(target); /* ref owned by symlink */ sysfs_get(target); /* ref owned by symlink */
sysfs_addrm_start(&acxt); sysfs_addrm_start(&acxt);
error = __sysfs_add_one(&acxt, sd, parent); error = sysfs_add_one(&acxt, sd, parent);
sysfs_addrm_finish(&acxt); sysfs_addrm_finish(&acxt);
if (!error) if (!error)

2
fs/sysfs/sysfs.h
View File

@ -167,8 +167,6 @@ struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd);
void sysfs_put_active(struct sysfs_dirent *sd); void sysfs_put_active(struct sysfs_dirent *sd);
void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt); void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt);
void sysfs_warn_dup(struct sysfs_dirent *parent, const char *name); void sysfs_warn_dup(struct sysfs_dirent *parent, const char *name);
int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd,
struct sysfs_dirent *parent_sd);
int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd, int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd,
struct sysfs_dirent *parent_sd); struct sysfs_dirent *parent_sd);
void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt); void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt);