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

Commit fac2622b authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Greg Kroah-Hartman
Browse files

sysfs: Pass super_block to sysfs_get_inode 



Currently sysfs_get_inode magically returns an inode on
sysfs_sb.  Make the super_block parameter explicit and
the code becomes clearer.

Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarSerge Hallyn <serue@us.ibm.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2354dcc7

fs/sysfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry, 
	}



	/* attach dentry and inode */

	inode = sysfs_get_inode(sd);

	inode = sysfs_get_inode(dir->i_sb, sd);

	if (!inode) {

		ret = ERR_PTR(-ENOMEM);

		goto out_unlock;

fs/sysfs/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode) 


/**

 *	sysfs_get_inode - get inode for sysfs_dirent

 *	@sb: super block

 *	@sd: sysfs_dirent to allocate inode for

 *

 *	Get inode for @sd.  If such inode doesn't exist, a new inode
@@ -295,11 +296,11 @@ static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode) 
 *	RETURNS:

 *	Pointer to allocated inode on success, NULL on failure.

 */

struct inode * sysfs_get_inode(struct sysfs_dirent *sd)

struct inode * sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd)

{

	struct inode *inode;



	inode = iget_locked(sysfs_sb, sd->s_ino);

	inode = iget_locked(sb, sd->s_ino);

	if (inode && (inode->i_state & I_NEW))

		sysfs_init_inode(sd, inode);

fs/sysfs/mount.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent) 


	/* get root inode, initialize and unlock it */

	mutex_lock(&sysfs_mutex);

	inode = sysfs_get_inode(&sysfs_root);

	inode = sysfs_get_inode(sb, &sysfs_root);

	mutex_unlock(&sysfs_mutex);

	if (!inode) {

		pr_debug("sysfs: could not get root inode\n");

fs/sysfs/sysfs.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static inline void __sysfs_put(struct sysfs_dirent *sd) 
/*

 * inode.c

 */

struct inode *sysfs_get_inode(struct sysfs_dirent *sd);

struct inode *sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd);

void sysfs_delete_inode(struct inode *inode);

int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr *iattr);

int sysfs_permission(struct inode *inode, int mask);