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: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
372e88bd19
commit
119dd52be3
3 changed files with 1 additions and 19 deletions
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue