Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18514
b: refs/heads/master
c: 2ff6b1c
h: refs/heads/master
v: v3
  • Loading branch information
Pekka Enberg authored and Linus Torvalds committed Jan 15, 2006
1 parent 98c1e85 commit cbd8e1a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 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: ba7fe369875075c3b0def9887afb7a44fa88175e
refs/heads/master: 2ff6b1c2575f13885c1d5291e4283682ad9a41cd
5 changes: 1 addition & 4 deletions trunk/fs/isofs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,5 @@ struct dentry *isofs_lookup(struct inode * dir, struct dentry * dentry, struct n
}
}
unlock_kernel();
if (inode)
return d_splice_alias(inode, dentry);
d_add(dentry, inode);
return NULL;
return d_splice_alias(inode, dentry);
}

0 comments on commit cbd8e1a

Please sign in to comment.