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>

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 5a70a93fc2f7eb03cd7134dc1bafac1a30a2b7c5..739dda176b434ebbd3a820b19e9e68df65ca43d2 100644 (file)
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -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:

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 200e1bf6f932e23fe5a458188049008b2157acb5..0d706a86d2c7f0bf5dbe4ef3eb14ffb874ca0871 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -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;

diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 043675471031e81a449986e6cbb7ec96cd762198..8a0aea1ab86d59fd744373612142af32e9f78bcc 100644 (file)
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -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,