projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'audit.b10' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...
[powerpc.git]
/
fs
/
isofs
/
namei.c
diff --git
a/fs/isofs/namei.c
b/fs/isofs/namei.c
index
e37e82b
..
e7ba0c3
100644
(file)
--- a/
fs/isofs/namei.c
+++ b/
fs/isofs/namei.c
@@
-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);
}