From be4daecf66adf44f03e26ea8067d5986e2085ec8 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 7 Jun 2012 20:56:54 -0400
Subject: [PATCH] --- yaml --- r: 312927 b: refs/heads/master c:
 e77fb7cef87856d9d35f2f4d617d0b97148ee7c2 h: refs/heads/master i:   312925:
 ed1a852371708e909270ef1e9bb934bd7f7b4976   312923:
 b5e141b8821e9babc97707bd2408e4d27bf288eb   312919:
 6c174f63a3947e6650c11ba518de2506881c2f31   312911:
 cffb4f46554efcbf78a5ff602553ca57bb407453   312895:
 5bbf1abc1818ca0c19c029bdcf2ae6b3f802f906 v: v3

---
 [refs]               | 2 +-
 trunk/fs/sysfs/dir.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index fef30a97b438..2fd385307f7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 469796d10590341c53cff0a2959254eaf5d465de
+refs/heads/master: e77fb7cef87856d9d35f2f4d617d0b97148ee7c2
diff --git a/trunk/fs/sysfs/dir.c b/trunk/fs/sysfs/dir.c
index 77c44ce493f8..a5cf784f9cc2 100644
--- a/trunk/fs/sysfs/dir.c
+++ b/trunk/fs/sysfs/dir.c
@@ -793,14 +793,7 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
 	}
 
 	/* instantiate and hash dentry */
-	ret = d_find_alias(inode);
-	if (!ret) {
-		d_add(dentry, inode);
-	} else {
-		d_move(ret, dentry);
-		iput(inode);
-	}
-
+	ret = d_materialise_unique(dentry, inode);
  out_unlock:
 	mutex_unlock(&sysfs_mutex);
 	return ret;