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

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

sysfs: Remove sysfs_instantiate 



Now that sysfs_get_inode is dropping the inode lock
we no longer have a need from sysfs_instantiate.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 372e88bd

fs/sysfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry, 
		goto out_unlock;

	}



	sysfs_instantiate(dentry, inode);

	d_instantiate(dentry, inode);

	sysfs_attach_dentry(sd, dentry);



 out_unlock:

fs/sysfs/inode.c

+0 −17
Original line number Diff line number Diff line
@@ -211,23 +211,6 @@ struct inode * sysfs_get_inode(struct sysfs_dirent *sd) 
	return inode;

}



/**

 *	sysfs_instantiate - instantiate dentry

 *	@dentry: dentry to be instantiated

 *	@inode: inode associated with @sd

 *

 *	Unlock @inode if locked and instantiate @dentry with @inode.

 *

 *	LOCKING:

 *	None.

 */

void sysfs_instantiate(struct dentry *dentry, struct inode *inode)

{

	BUG_ON(!dentry || dentry->d_inode);



	d_instantiate(dentry, inode);

}



int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name)

{

	struct sysfs_addrm_cxt acxt;

fs/sysfs/sysfs.h

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ extern void sysfs_remove_one(struct sysfs_addrm_cxt *acxt, 
extern void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt);



extern struct inode * sysfs_get_inode(struct sysfs_dirent *sd);

extern void sysfs_instantiate(struct dentry *dentry, struct inode *inode);



extern void release_sysfs_dirent(struct sysfs_dirent * sd);

extern struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd,