---

yaml --- r: 312927 b: refs/heads/master c: e77fb7c h: refs/heads/master i: 312925: ed1a852 312923: b5e141b 312919: 6c174f6 312911: cffb4f4 312895: 5bbf1ab v: v3
git-mirror · Jul 14, 2012 · be4daec · be4daec
1 parent eced7bc
commit be4daec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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;