Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ecb6a08 authored Jun 30, 2006 by J. Bruce Fields Committed by Linus Torvalds Jun 30, 2006

[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>

parent ba5a6a19

fs/nfsd/nfs4state.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;

fs/nfsd/vfs.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -673,6 +673,9 @@ nfsd_open(struct svc_rqst rqstp, struct svc_fh fhp, int type,
		goto out_nfserr;

		if (access & MAY_WRITE) {
		if (access & MAY_READ)
		flags = O_RDWR\|O_LARGEFILE;
		else
		flags = O_WRONLY\|O_LARGEFILE;

		DQUOT_INIT(inode);