From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 8 Jun 2012 00:56:54 +0000 (-0400)
Subject: sysfs: just use d_materialise_unique()
X-Git-Tag: v3.6-rc1~152^2~61
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e77fb7cef87856d9d35f2f4d617d0b97148ee7c2;p=~emulex%2Finfiniband.git

sysfs: just use d_materialise_unique()

same as for nfs et.al.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 77c44ce493f..a5cf784f9cc 100644
--- a/fs/sysfs/dir.c
+++ b/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;