From 46b007c50966a9dbea870a3bd0b5310b216464f8 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Mon, 20 Aug 2007 21:36:29 +0900
Subject: [PATCH] --- yaml --- r: 67973 b: refs/heads/master c:
 119dd52be33dfe6285f586ab7354897fdefc7e23 h: refs/heads/master i:   67971:
 01bf20f3a5f8faf92586f2e70b38dc9754fa14da v: v3

---
 [refs]                 |  2 +-
 trunk/fs/sysfs/dir.c   |  2 +-
 trunk/fs/sysfs/inode.c | 17 -----------------
 trunk/fs/sysfs/sysfs.h |  1 -
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 41ff17ba6c36..4843bedcd237 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 372e88bd1922228e0a55228f6dc8e311d1696fa0
+refs/heads/master: 119dd52be33dfe6285f586ab7354897fdefc7e23
diff --git a/trunk/fs/sysfs/dir.c b/trunk/fs/sysfs/dir.c
index 5a70a93fc2f7..739dda176b43 100644
--- a/trunk/fs/sysfs/dir.c
+++ b/trunk/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/trunk/fs/sysfs/inode.c b/trunk/fs/sysfs/inode.c
index 200e1bf6f932..0d706a86d2c7 100644
--- a/trunk/fs/sysfs/inode.c
+++ b/trunk/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/trunk/fs/sysfs/sysfs.h b/trunk/fs/sysfs/sysfs.h
index 043675471031..8a0aea1ab86d 100644
--- a/trunk/fs/sysfs/sysfs.h
+++ b/trunk/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,