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

Commit 73c403a9 authored by Benny Halevy's avatar Benny Halevy
Browse files

nfs41: use nfs4_setaclres 



In preparation for nfs41 sequence processing.

Signed-off-by: default avatarAndy Admason <andros@netapp.com>
[define nfs_setaclres]
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 9e9ecc03

fs/nfs/nfs4proc.c

+2 −1
Original line number Diff line number Diff line
@@ -2842,10 +2842,11 @@ static int __nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t bufl 
		.acl_pages	= pages,

		.acl_len	= buflen,

	};

	struct nfs_setaclres res;

	struct rpc_message msg = {

		.rpc_proc	= &nfs4_procedures[NFSPROC4_CLNT_SETACL],

		.rpc_argp	= &arg,

		.rpc_resp	= NULL,

		.rpc_resp	= &res,

	};

	int ret;

fs/nfs/nfs4xdr.c

+2 −1
Original line number Diff line number Diff line
@@ -3996,7 +3996,8 @@ nfs4_xdr_enc_setacl(struct rpc_rqst *req, __be32 *p, struct nfs_setaclargs *args 
 * Decode SETACL response

 */

static int

nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p, void *res)

nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p,

		    struct nfs_setaclres *res)

{

	struct xdr_stream xdr;

	struct compound_hdr hdr;

include/linux/nfs_xdr.h

+4 −0
Original line number Diff line number Diff line
@@ -436,6 +436,10 @@ struct nfs_setaclargs { 
	struct nfs4_sequence_args	seq_args;

};



struct nfs_setaclres {

	struct nfs4_sequence_res	seq_res;

};



struct nfs_getaclargs {

	struct nfs_fh *			fh;

	size_t				acl_len;