projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[cascardo/linux.git]
/
fs
/
freevxfs
/
vxfs_lookup.c
diff --git
a/fs/freevxfs/vxfs_lookup.c
b/fs/freevxfs/vxfs_lookup.c
index
bf86e54
..
aee049c
100644
(file)
--- a/
fs/freevxfs/vxfs_lookup.c
+++ b/
fs/freevxfs/vxfs_lookup.c
@@
-213,10
+213,10
@@
vxfs_lookup(struct inode *dip, struct dentry *dp, struct nameidata *nd)
lock_kernel();
ino = vxfs_inode_by_name(dip, dp);
if (ino) {
- ip = iget(dip->i_sb, ino);
- if (
!ip
) {
+ ip =
vxfs_
iget(dip->i_sb, ino);
+ if (
IS_ERR(ip)
) {
unlock_kernel();
- return ERR_
PTR(-EACCES
);
+ return ERR_
CAST(ip
);
}
}
unlock_kernel();