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

Commit 388975cc authored by Tejun Heo's avatar Tejun Heo Committed by Greg Kroah-Hartman
Browse files

sysfs: clean up sysfs_get_dirent() 



The pre-existing sysfs interfaces which take explicit namespace
argument are weird in that they place the optional @ns in front of
@name which is contrary to the established convention.  For example,
we end up forcing vast majority of sysfs_get_dirent() users to do
sysfs_get_dirent(parent, NULL, name), which is silly and error-prone
especially as @ns and @name may be interchanged without causing
compilation warning.

This renames sysfs_get_dirent() to sysfs_get_dirent_ns() and swap the
positions of @name and @ns, and sysfs_get_dirent() is now a wrapper
around sysfs_get_dirent_ns().  This makes confusions a lot less
likely.

There are other interfaces which take @ns before @name.  They'll be
updated by following patches.

This patch doesn't introduce any functional changes.

v2: EXPORT_SYMBOL_GPL() wasn't updated leading to undefined symbol
    error on module builds.  Reported by build test robot.  Fixed.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Kay Sievers <kay@vrfy.org>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb26a311

drivers/gpio/gpiolib.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev, 
			IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING;



	if (!value_sd) {

		value_sd = sysfs_get_dirent(dev->kobj.sd, NULL, "value");

		value_sd = sysfs_get_dirent(dev->kobj.sd, "value");

		if (!value_sd) {

			ret = -ENODEV;

			goto err_out;

drivers/md/bitmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1654,9 +1654,9 @@ int bitmap_create(struct mddev *mddev) 
	bitmap->mddev = mddev;



	if (mddev->kobj.sd)

		bm = sysfs_get_dirent(mddev->kobj.sd, NULL, "bitmap");

		bm = sysfs_get_dirent(mddev->kobj.sd, "bitmap");

	if (bm) {

		bitmap->sysfs_can_clear = sysfs_get_dirent(bm, NULL, "can_clear");

		bitmap->sysfs_can_clear = sysfs_get_dirent(bm, "can_clear");

		sysfs_put(bm);

	} else

		bitmap->sysfs_can_clear = NULL;

drivers/md/md.c

+1 −1
Original line number Diff line number Diff line
@@ -3555,7 +3555,7 @@ level_store(struct mddev *mddev, const char *buf, size_t len) 
			printk(KERN_WARNING

			       "md: cannot register extra attributes for %s\n",

			       mdname(mddev));

		mddev->sysfs_action = sysfs_get_dirent(mddev->kobj.sd, NULL, "sync_action");

		mddev->sysfs_action = sysfs_get_dirent(mddev->kobj.sd, "sync_action");

	}		

	if (mddev->pers->sync_request != NULL &&

	    pers->sync_request == NULL) {

drivers/md/md.h

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ extern struct attribute_group md_bitmap_group; 
static inline struct sysfs_dirent *sysfs_get_dirent_safe(struct sysfs_dirent *sd, char *name)

{

	if (sd)

		return sysfs_get_dirent(sd, NULL, name);

		return sysfs_get_dirent(sd, name);

	return sd;

}

static inline void sysfs_notify_dirent_safe(struct sysfs_dirent *sd)

fs/sysfs/dir.c

+6 −5
Original line number Diff line number Diff line
@@ -630,9 +630,10 @@ struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd, 
}



/**

 *	sysfs_get_dirent - find and get sysfs_dirent with the given name

 *	sysfs_get_dirent_ns - find and get sysfs_dirent with the given name

 *	@parent_sd: sysfs_dirent to search under

 *	@name: name to look for

 *	@ns: the namespace tag to use

 *

 *	Look for sysfs_dirent with name @name under @parent_sd and get

 *	it if found.
@@ -643,9 +644,9 @@ struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd, 
 *	RETURNS:

 *	Pointer to sysfs_dirent if found, NULL if not.

 */

struct sysfs_dirent *sysfs_get_dirent(struct sysfs_dirent *parent_sd,

				      const void *ns,

				      const unsigned char *name)

struct sysfs_dirent *sysfs_get_dirent_ns(struct sysfs_dirent *parent_sd,

					 const unsigned char *name,

					 const void *ns)

{

	struct sysfs_dirent *sd;
@@ -656,7 +657,7 @@ struct sysfs_dirent *sysfs_get_dirent(struct sysfs_dirent *parent_sd, 


	return sd;

}

EXPORT_SYMBOL_GPL(sysfs_get_dirent);

EXPORT_SYMBOL_GPL(sysfs_get_dirent_ns);



static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,

	const void *ns, const char *name, struct sysfs_dirent **p_sd)