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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
fs
/
namei.c
diff --git
a/fs/namei.c
b/fs/namei.c
index
3b993db
..
73e2e66
100644
(file)
--- a/
fs/namei.c
+++ b/
fs/namei.c
@@
-1605,7
+1605,7
@@
int may_open(struct nameidata *nd, int acc_mode, int flag)
if (S_ISLNK(inode->i_mode))
return -ELOOP;
if (S_ISLNK(inode->i_mode))
return -ELOOP;
- if (S_ISDIR(inode->i_mode) && (
flag & FMODE
_WRITE))
+ if (S_ISDIR(inode->i_mode) && (
acc_mode & MAY
_WRITE))
return -EISDIR;
/*
return -EISDIR;
/*
@@
-1620,7
+1620,7
@@
int may_open(struct nameidata *nd, int acc_mode, int flag)
return -EACCES;
flag &= ~O_TRUNC;
return -EACCES;
flag &= ~O_TRUNC;
- } else if (IS_RDONLY(inode) && (
flag & FMODE
_WRITE))
+ } else if (IS_RDONLY(inode) && (
acc_mode & MAY
_WRITE))
return -EROFS;
error = vfs_permission(nd, acc_mode);
return -EROFS;
error = vfs_permission(nd, acc_mode);