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;