xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Andreas Gruenbacher
2015-11-03 18:25:34 +01:00
committed by Trond Myklebust
parent 118c916356
commit 8fbcf23743
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfs/nfs4proc.c
View File

@@ -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) #define NFS4ACL_MAXPAGES DIV_ROUND_UP(XATTR_SIZE_MAX, PAGE_SIZE)
static int buf_to_pages_noslab(const void *buf, size_t buflen, 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; struct page *newpage, **spages;
int rc = 0; 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; goto out_free;
args.acl_len = npages * PAGE_SIZE; args.acl_len = npages * PAGE_SIZE;
args.acl_pgbase = 0;
dprintk("%s buf %p buflen %zu npages %d args.acl_len %zu\n", dprintk("%s buf %p buflen %zu npages %d args.acl_len %zu\n",
__func__, buf, buflen, npages, args.acl_len); __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; return -EOPNOTSUPP;
if (npages > ARRAY_SIZE(pages)) if (npages > ARRAY_SIZE(pages))
return -ERANGE; 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) if (i < 0)
return i; return i;
nfs4_inode_return_delegation(inode); nfs4_inode_return_delegation(inode);

4
fs/nfs/nfs4xdr.c
View File

@@ -1659,7 +1659,7 @@ encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg, struct compoun
*p = cpu_to_be32(FATTR4_WORD0_ACL); *p = cpu_to_be32(FATTR4_WORD0_ACL);
p = reserve_space(xdr, 4); p = reserve_space(xdr, 4);
*p = cpu_to_be32(arg->acl_len); *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 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); encode_getattr_two(xdr, FATTR4_WORD0_ACL, 0, &hdr);
xdr_inline_pages(&req->rq_rcv_buf, replen << 2, 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); encode_nops(&hdr);
} }

2
include/linux/nfs_xdr.h
View File

@@ -705,7 +705,6 @@ struct nfs_setaclargs {
struct nfs4_sequence_args seq_args; struct nfs4_sequence_args seq_args;
struct nfs_fh * fh; struct nfs_fh * fh;
size_t acl_len; size_t acl_len;
unsigned int acl_pgbase;
struct page ** acl_pages; struct page ** acl_pages;
}; };
@@ -717,7 +716,6 @@ struct nfs_getaclargs {
struct nfs4_sequence_args seq_args; struct nfs4_sequence_args seq_args;
struct nfs_fh * fh; struct nfs_fh * fh;
size_t acl_len; size_t acl_len;
unsigned int acl_pgbase;
struct page ** acl_pages; struct page ** acl_pages;
}; };