Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d0cfbec authored by Tejun Heo's avatar Tejun Heo Committed by Greg Kroah-Hartman
Browse files

sysfs, kernfs: remove sysfs_add_one() 



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: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 496f7394

fs/sysfs/dir.c

+4 −37
Original line number Diff line number Diff line
@@ -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

 *	@sd: sysfs_dirent to be added

 *	@parent_sd: the parent sysfs_dirent to add @sd to
@@ -415,7 +415,7 @@ void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt) 
 *	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,

int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd,

		  struct sysfs_dirent *parent_sd)

{

	bool has_ns = parent_sd->s_flags & SYSFS_FLAG_NS;
@@ -487,39 +487,6 @@ void sysfs_warn_dup(struct sysfs_dirent *parent, const char *name) 
	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

 *	@acxt: addrm context to use
@@ -694,7 +661,7 @@ struct sysfs_dirent *kernfs_create_dir_ns(struct sysfs_dirent *parent, 


	/* link in */

	sysfs_addrm_start(&acxt);

	rc = __sysfs_add_one(&acxt, sd, parent);

	rc = sysfs_add_one(&acxt, sd, parent);

	sysfs_addrm_finish(&acxt);



	if (!rc)

fs/sysfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ struct sysfs_dirent *kernfs_create_file_ns(struct sysfs_dirent *parent, 
		sd->s_flags |= SYSFS_FLAG_HAS_MMAP;



	sysfs_addrm_start(&acxt);

	rc = __sysfs_add_one(&acxt, sd, parent);

	rc = sysfs_add_one(&acxt, sd, parent);

	sysfs_addrm_finish(&acxt);



	if (rc) {

fs/sysfs/symlink.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ struct sysfs_dirent *kernfs_create_link(struct sysfs_dirent *parent, 
	sysfs_get(target);	/* ref owned by symlink */



	sysfs_addrm_start(&acxt);

	error = __sysfs_add_one(&acxt, sd, parent);

	error = sysfs_add_one(&acxt, sd, parent);

	sysfs_addrm_finish(&acxt);



	if (!error)

fs/sysfs/sysfs.h

+0 −2
Original line number Diff line number Diff line
@@ -167,8 +167,6 @@ struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd); 
void sysfs_put_active(struct sysfs_dirent *sd);

void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt);

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,

		  struct sysfs_dirent *parent_sd);

void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt);