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

Commit 8bcbe7d9 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFSv4: Don't ask for attributes when ACCESS is protected by a delegation 



If we hold a delegation, then the results of the ACCESS call are protected
anyway.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 36b3743f

fs/nfs/nfs4proc.c

+8 −5
Original line number Diff line number Diff line
@@ -4055,7 +4055,6 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry 
	struct nfs_server *server = NFS_SERVER(inode);

	struct nfs4_accessargs args = {

		.fh = NFS_FH(inode),

		.bitmask = server->cache_consistency_bitmask,

		.access = entry->mask,

	};

	struct nfs4_accessres res = {
@@ -4069,13 +4068,17 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry 
	};

	int status = 0;



	if (!nfs_have_delegated_attributes(inode)) {

		res.fattr = nfs_alloc_fattr();

		if (res.fattr == NULL)

			return -ENOMEM;

		args.bitmask = server->cache_consistency_bitmask;

	}



	status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 0);

	if (!status) {

		nfs_access_set_mask(entry, res.access);

		if (res.fattr)

			nfs_refresh_inode(inode, res.fattr);

	}

	nfs_free_fattr(res.fattr);

fs/nfs/nfs4xdr.c

+4 −2
Original line number Diff line number Diff line
@@ -2102,6 +2102,7 @@ static void nfs4_xdr_enc_access(struct rpc_rqst *req, struct xdr_stream *xdr, 
	encode_sequence(xdr, &args->seq_args, &hdr);

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

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

	if (args->bitmask)

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

	encode_nops(&hdr);

}
@@ -6236,6 +6237,7 @@ static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, struct xdr_stream *xdr, 
	status = decode_access(xdr, &res->supported, &res->access);

	if (status != 0)

		goto out;

	if (res->fattr)

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

out:

	return status;