git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[safe/jmp/linux-2.6]
/
fs
/
nfsctl.c
diff --git
a/fs/nfsctl.c
b/fs/nfsctl.c
index
d3854d9
..
bf9cbd2
100644
(file)
--- a/
fs/nfsctl.c
+++ b/
fs/nfsctl.c
@@
-36,10
+36,9
@@
static struct file *do_open(char *name, int flags)
return ERR_PTR(error);
if (flags == O_RDWR)
return ERR_PTR(error);
if (flags == O_RDWR)
- error = may_open(&nd.path, MAY_READ|MAY_WRITE,
- FMODE_READ|FMODE_WRITE);
+ error = may_open(&nd.path, MAY_READ|MAY_WRITE, flags);
else
else
- error = may_open(&nd.path, MAY_WRITE,
FMODE_WRITE
);
+ error = may_open(&nd.path, MAY_WRITE,
flags
);
if (!error)
return dentry_open(nd.path.dentry, nd.path.mnt, flags,
if (!error)
return dentry_open(nd.path.dentry, nd.path.mnt, flags,