aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2009-04-01 09:22:01 -0400
committerBenny Halevy <bhalevy@panasas.com>2009-06-17 13:46:26 -0400
commit73c403a9a93743b068103c13c05ed136dc687d05 (patch)
tree9f95f8cb6f8c6ab866c08a5659d281847f0b3a23 /fs/nfs
parent9e9ecc03d6b37a5d85e16b357751e3b341de0fef (diff)
nfs41: use nfs4_setaclres
In preparation for nfs41 sequence processing. Signed-off-by: Andy Admason <andros@netapp.com> [define nfs_setaclres] Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4proc.c3
-rw-r--r--fs/nfs/nfs4xdr.c3
2 files changed, 4 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;