git.openpandora.org
/
pandora-kernel.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://www.jni.nu/cris
[pandora-kernel.git]
/
fs
/
sysv
/
namei.c
diff --git
a/fs/sysv/namei.c
b/fs/sysv/namei.c
index
4e48abb
..
a1f1ef3
100644
(file)
--- a/
fs/sysv/namei.c
+++ b/
fs/sysv/namei.c
@@
-13,7
+13,6
@@
*/
#include <linux/pagemap.h>
*/
#include <linux/pagemap.h>
-#include <linux/smp_lock.h>
#include "sysv.h"
static int add_nondir(struct dentry *dentry, struct inode *inode)
#include "sysv.h"
static int add_nondir(struct dentry *dentry, struct inode *inode)
@@
-54,9
+53,9
@@
static struct dentry *sysv_lookup(struct inode * dir, struct dentry * dentry, st
ino = sysv_inode_by_name(dentry);
if (ino) {
ino = sysv_inode_by_name(dentry);
if (ino) {
- inode = iget(dir->i_sb, ino);
- if (
!inode
)
- return ERR_
PTR(-EACCES
);
+ inode =
sysv_
iget(dir->i_sb, ino);
+ if (
IS_ERR(inode)
)
+ return ERR_
CAST(inode
);
}
d_add(dentry, inode);
return NULL;
}
d_add(dentry, inode);
return NULL;