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

Commit ae2bb032 authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Trond Myklebust
Browse files

NFSv4: don't put ACCESS in OPEN compound if O_EXCL 



Don't put an ACCESS op in OPEN compound if O_EXCL, because ACCESS
will return permission denied for all bits until close.

Fixes a regression due to commit 6168f62c (NFSv4: Add ACCESS operation to
OPEN compound)

Signed-off-by: default avatarWeston Andros Adamson <dros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent bbd3a8ee

fs/nfs/nfs4proc.c

+9 −3
Original line number Diff line number Diff line
@@ -862,9 +862,15 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry, 
	p->o_arg.fh = NFS_FH(dir);

	p->o_arg.open_flags = flags;

	p->o_arg.fmode = fmode & (FMODE_READ|FMODE_WRITE);

	/* ask server to check for all possible rights as results are cached */

	/* don't put an ACCESS op in OPEN compound if O_EXCL, because ACCESS

	 * will return permission denied for all bits until close */

	if (!(flags & O_EXCL)) {

		/* ask server to check for all possible rights as results

		 * are cached */

		p->o_arg.access = NFS4_ACCESS_READ | NFS4_ACCESS_MODIFY |

				  NFS4_ACCESS_EXTEND | NFS4_ACCESS_EXECUTE;

		p->o_res.access_request = p->o_arg.access;

	}

	p->o_arg.clientid = server->nfs_client->cl_clientid;

	p->o_arg.id.create_time = ktime_to_ns(sp->so_seqid.create_time);

	p->o_arg.id.uniquifier = sp->so_seqid.owner_id;

fs/nfs/nfs4xdr.c

+8 −4
Original line number Diff line number Diff line
@@ -2224,6 +2224,7 @@ static void nfs4_xdr_enc_open(struct rpc_rqst *req, struct xdr_stream *xdr, 
	encode_putfh(xdr, args->fh, &hdr);

	encode_open(xdr, args, &hdr);

	encode_getfh(xdr, &hdr);

	if (args->access)

		encode_access(xdr, args->access, &hdr);

	encode_getfattr_open(xdr, args->bitmask, args->open_bitmap, &hdr);

	encode_nops(&hdr);
@@ -2261,6 +2262,7 @@ static void nfs4_xdr_enc_open_noattr(struct rpc_rqst *req, 
	encode_sequence(xdr, &args->seq_args, &hdr);

	encode_putfh(xdr, args->fh, &hdr);

	encode_open(xdr, args, &hdr);

	if (args->access)

		encode_access(xdr, args->access, &hdr);

	encode_getfattr(xdr, args->bitmask, &hdr);

	encode_nops(&hdr);
@@ -6239,6 +6241,7 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, struct xdr_stream *xdr, 
	status = decode_getfh(xdr, &res->fh);

	if (status)

		goto out;

	if (res->access_request)

		decode_access(xdr, &res->access_supported, &res->access_result);

	decode_getfattr(xdr, res->f_attr, res->server);

out:
@@ -6288,6 +6291,7 @@ static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp, 
	status = decode_open(xdr, res);

	if (status)

		goto out;

	if (res->access_request)

		decode_access(xdr, &res->access_supported, &res->access_result);

	decode_getfattr(xdr, res->f_attr, res->server);

out:

include/linux/nfs_xdr.h

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ struct nfs_openres { 
	struct nfs4_string	*owner;

	struct nfs4_string	*group_owner;

	struct nfs4_sequence_res	seq_res;

	__u32			access_request;

	__u32			access_supported;

	__u32			access_result;

};