Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18515
b: refs/heads/master
c: d9975d6
h: refs/heads/master
i:
  18513: 98c1e85
  18511: 058a401
v: v3
  • Loading branch information
Pekka Enberg authored and Linus Torvalds committed Jan 15, 2006
1 parent cbd8e1a commit 3e4a73f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2ff6b1c2575f13885c1d5291e4283682ad9a41cd
refs/heads/master: d9975d6ba0668aa21d9f0c565d7df56c805c8d5c
6 changes: 1 addition & 5 deletions trunk/fs/reiserfs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit 3e4a73f

Please sign in to comment.