diff --git a/[refs] b/[refs] index ad1877f40549..1c6647edb950 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ff6b1c2575f13885c1d5291e4283682ad9a41cd +refs/heads/master: d9975d6ba0668aa21d9f0c565d7df56c805c8d5c diff --git a/trunk/fs/reiserfs/namei.c b/trunk/fs/reiserfs/namei.c index 3549067c42d9..8f8d8d01107c 100644 --- a/trunk/fs/reiserfs/namei.c +++ b/trunk/fs/reiserfs/namei.c @@ -375,11 +375,7 @@ static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry, return ERR_PTR(-EIO); } - if (inode) - return d_splice_alias(inode, dentry); - - d_add(dentry, inode); - return NULL; + return d_splice_alias(inode, dentry); } /*