aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/nfs4proc.c3
-rw-r--r--fs/nfs/nfs4xdr.c3
-rw-r--r--include/linux/nfs_xdr.h4
3 files changed, 8 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 20c9acf689fd..62bbe25d9423 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2842,10 +2842,11 @@ static int __nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t bufl
2842 .acl_pages = pages, 2842 .acl_pages = pages,
2843 .acl_len = buflen, 2843 .acl_len = buflen,
2844 }; 2844 };
2845 struct nfs_setaclres res;
2845 struct rpc_message msg = { 2846 struct rpc_message msg = {
2846 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETACL], 2847 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETACL],
2847 .rpc_argp = &arg, 2848 .rpc_argp = &arg,
2848 .rpc_resp = NULL, 2849 .rpc_resp = &res,
2849 }; 2850 };
2850 int ret; 2851 int ret;
2851 2852
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 27dd25d9ad42..aa350d5bf207 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -3996,7 +3996,8 @@ nfs4_xdr_enc_setacl(struct rpc_rqst *req, __be32 *p, struct nfs_setaclargs *args
3996 * Decode SETACL response 3996 * Decode SETACL response
3997 */ 3997 */
3998static int 3998static int
3999nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p, void *res) 3999nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p,
4000 struct nfs_setaclres *res)
4000{ 4001{
4001 struct xdr_stream xdr; 4002 struct xdr_stream xdr;
4002 struct compound_hdr hdr; 4003 struct compound_hdr hdr;
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 6e9ee2848606..0f2dc8f4cc36 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -436,6 +436,10 @@ struct nfs_setaclargs {
436 struct nfs4_sequence_args seq_args; 436 struct nfs4_sequence_args seq_args;
437}; 437};
438 438
439struct nfs_setaclres {
440 struct nfs4_sequence_res seq_res;
441};
442
439struct nfs_getaclargs { 443struct nfs_getaclargs {
440 struct nfs_fh * fh; 444 struct nfs_fh * fh;
441 size_t acl_len; 445 size_t acl_len;