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

Commit 8fbcf237 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Trond Myklebust
Browse files

nfs: Remove unused xdr page offsets in getacl/setacl arguments 



The arguments passed around for getacl and setacl xdr encoding, struct
nfs_setaclargs and struct nfs_getaclargs, both contain an array of
pages, an offset into the first page, and the length of the page data.
The offset is unused as it is always zero; remove it.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 118c9163

fs/nfs/nfs4proc.c

+2 −3
Original line number Diff line number Diff line
@@ -4603,7 +4603,7 @@ static inline int nfs4_server_supports_acls(struct nfs_server *server) 
#define NFS4ACL_MAXPAGES DIV_ROUND_UP(XATTR_SIZE_MAX, PAGE_SIZE)



static int buf_to_pages_noslab(const void *buf, size_t buflen,

		struct page **pages, unsigned int *pgbase)

		struct page **pages)

{

	struct page *newpage, **spages;

	int rc = 0;
@@ -4747,7 +4747,6 @@ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t bu 
		goto out_free;



	args.acl_len = npages * PAGE_SIZE;

	args.acl_pgbase = 0;



	dprintk("%s  buf %p buflen %zu npages %d args.acl_len %zu\n",

		__func__, buf, buflen, npages, args.acl_len);
@@ -4839,7 +4838,7 @@ static int __nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t bufl 
		return -EOPNOTSUPP;

	if (npages > ARRAY_SIZE(pages))

		return -ERANGE;

	i = buf_to_pages_noslab(buf, buflen, arg.acl_pages, &arg.acl_pgbase);

	i = buf_to_pages_noslab(buf, buflen, arg.acl_pages);

	if (i < 0)

		return i;

	nfs4_inode_return_delegation(inode);

fs/nfs/nfs4xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -1659,7 +1659,7 @@ encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg, struct compoun 
	*p = cpu_to_be32(FATTR4_WORD0_ACL);

	p = reserve_space(xdr, 4);

	*p = cpu_to_be32(arg->acl_len);

	xdr_write_pages(xdr, arg->acl_pages, arg->acl_pgbase, arg->acl_len);

	xdr_write_pages(xdr, arg->acl_pages, 0, arg->acl_len);

}



static void
@@ -2491,7 +2491,7 @@ static void nfs4_xdr_enc_getacl(struct rpc_rqst *req, struct xdr_stream *xdr, 
	encode_getattr_two(xdr, FATTR4_WORD0_ACL, 0, &hdr);



	xdr_inline_pages(&req->rq_rcv_buf, replen << 2,

		args->acl_pages, args->acl_pgbase, args->acl_len);

		args->acl_pages, 0, args->acl_len);



	encode_nops(&hdr);

}

include/linux/nfs_xdr.h

+0 −2
Original line number Diff line number Diff line
@@ -705,7 +705,6 @@ struct nfs_setaclargs { 
	struct nfs4_sequence_args	seq_args;

	struct nfs_fh *			fh;

	size_t				acl_len;

	unsigned int			acl_pgbase;

	struct page **			acl_pages;

};
@@ -717,7 +716,6 @@ struct nfs_getaclargs { 
	struct nfs4_sequence_args 	seq_args;

	struct nfs_fh *			fh;

	size_t				acl_len;

	unsigned int			acl_pgbase;

	struct page **			acl_pages;

};