[PATCH] knfsd: nfsd4: fix open flag passing
Since nfsv4 actually keeps around the file descriptors it gets from open (instead of just using them for a single read or write operation), we need to make sure that we can do RDWR opens and not just RDONLY/WRONLY. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
ba5a6a19d8
commit
9ecb6a08d8
2 changed files with 7 additions and 4 deletions
|
@ -1790,10 +1790,10 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
|
|||
} else {
|
||||
/* Stateid was not found, this is a new OPEN */
|
||||
int flags = 0;
|
||||
if (open->op_share_access & NFS4_SHARE_ACCESS_READ)
|
||||
flags |= MAY_READ;
|
||||
if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE)
|
||||
flags = MAY_WRITE;
|
||||
else
|
||||
flags = MAY_READ;
|
||||
flags |= MAY_WRITE;
|
||||
status = nfs4_new_open(rqstp, &stp, dp, current_fh, flags);
|
||||
if (status)
|
||||
goto out;
|
||||
|
|
|
@ -673,7 +673,10 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
|
|||
goto out_nfserr;
|
||||
|
||||
if (access & MAY_WRITE) {
|
||||
flags = O_WRONLY|O_LARGEFILE;
|
||||
if (access & MAY_READ)
|
||||
flags = O_RDWR|O_LARGEFILE;
|
||||
else
|
||||
flags = O_WRONLY|O_LARGEFILE;
|
||||
|
||||
DQUOT_INIT(inode);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue