Skip to content

L
linux
Commit bf269551 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files
Options

SUNRPC: New xdr_streams XDR decoder API 

Now that all client-side XDR decoder routines use xdr_streams, there
should be no need to support the legacy calling sequence [rpc_rqst *,
__be32 *, RPC res *] anywhere.  We can construct an xdr_stream in the
generic RPC code, instead of in each decoder function.

This is a refactoring change.  It should not cause different behavior.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 9f06c719
Hide whitespace changes
Inline Side-by-side
Showing with 518 additions and 566 deletions
fs/lockd/clnt4xdr.c
View file @ bf269551
...@@ -529,17 +529,16 @@ static int decode_nlm4_testrply(struct xdr_stream *xdr, ...@@ -529,17 +529,16 @@ static int decode_nlm4_testrply(struct xdr_stream *xdr,
return error; return error;
} }
static int nlm4_xdr_dec_testres(struct rpc_rqst *req, __be32 *p, static int nlm4_xdr_dec_testres(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nlm_res *result) struct nlm_res *result)
{ {
struct xdr_stream xdr;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_cookie(xdr, &result->cookie);
error = decode_cookie(&xdr, &result->cookie);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_nlm4_testrply(&xdr, result); error = decode_nlm4_testrply(xdr, result);
out: out:
return error; return error;
} }
...@@ -550,17 +549,16 @@ static int nlm4_xdr_dec_testres(struct rpc_rqst *req, __be32 *p, ...@@ -550,17 +549,16 @@ static int nlm4_xdr_dec_testres(struct rpc_rqst *req, __be32 *p,
* nlm4_stat stat; * nlm4_stat stat;
* }; * };
*/ */
static int nlm4_xdr_dec_res(struct rpc_rqst *req, __be32 *p, static int nlm4_xdr_dec_res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nlm_res *result) struct nlm_res *result)
{ {
struct xdr_stream xdr;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_cookie(xdr, &result->cookie);
error = decode_cookie(&xdr, &result->cookie);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_nlm4_stat(&xdr, &result->status); error = decode_nlm4_stat(xdr, &result->status);
out: out:
return error; return error;
} }
...@@ -575,7 +573,7 @@ static int nlm4_xdr_dec_res(struct rpc_rqst *req, __be32 *p, ...@@ -575,7 +573,7 @@ static int nlm4_xdr_dec_res(struct rpc_rqst *req, __be32 *p,
[NLMPROC_##proc] = { \ [NLMPROC_##proc] = { \
.p_proc = NLMPROC_##proc, \ .p_proc = NLMPROC_##proc, \
.p_encode = (kxdreproc_t)nlm4_xdr_enc_##argtype, \ .p_encode = (kxdreproc_t)nlm4_xdr_enc_##argtype, \
.p_decode = (kxdrproc_t)nlm4_xdr_dec_##restype, \ .p_decode = (kxdrdproc_t)nlm4_xdr_dec_##restype, \
.p_arglen = NLM4_##argtype##_sz, \ .p_arglen = NLM4_##argtype##_sz, \
.p_replen = NLM4_##restype##_sz, \ .p_replen = NLM4_##restype##_sz, \
.p_statidx = NLMPROC_##proc, \ .p_statidx = NLMPROC_##proc, \
......
fs/lockd/clntxdr.c
View file @ bf269551
...@@ -527,17 +527,16 @@ static int decode_nlm_testrply(struct xdr_stream *xdr, ...@@ -527,17 +527,16 @@ static int decode_nlm_testrply(struct xdr_stream *xdr,
return error; return error;
} }
static int nlm_xdr_dec_testres(struct rpc_rqst *req, __be32 *p, static int nlm_xdr_dec_testres(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nlm_res *result) struct nlm_res *result)
{ {
struct xdr_stream xdr;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_cookie(xdr, &result->cookie);
error = decode_cookie(&xdr, &result->cookie);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_nlm_testrply(&xdr, result); error = decode_nlm_testrply(xdr, result);
out: out:
return error; return error;
} }
...@@ -548,17 +547,16 @@ static int nlm_xdr_dec_testres(struct rpc_rqst *req, __be32 *p, ...@@ -548,17 +547,16 @@ static int nlm_xdr_dec_testres(struct rpc_rqst *req, __be32 *p,
* nlm_stat stat; * nlm_stat stat;
* }; * };
*/ */
static int nlm_xdr_dec_res(struct rpc_rqst *req, __be32 *p, static int nlm_xdr_dec_res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nlm_res *result) struct nlm_res *result)
{ {
struct xdr_stream xdr;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_cookie(xdr, &result->cookie);
error = decode_cookie(&xdr, &result->cookie);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_nlm_stat(&xdr, &result->status); error = decode_nlm_stat(xdr, &result->status);
out: out:
return error; return error;
} }
...@@ -573,7 +571,7 @@ static int nlm_xdr_dec_res(struct rpc_rqst *req, __be32 *p, ...@@ -573,7 +571,7 @@ static int nlm_xdr_dec_res(struct rpc_rqst *req, __be32 *p,
[NLMPROC_##proc] = { \ [NLMPROC_##proc] = { \
.p_proc = NLMPROC_##proc, \ .p_proc = NLMPROC_##proc, \
.p_encode = (kxdreproc_t)nlm_xdr_enc_##argtype, \ .p_encode = (kxdreproc_t)nlm_xdr_enc_##argtype, \
.p_decode = (kxdrproc_t)nlm_xdr_dec_##restype, \ .p_decode = (kxdrdproc_t)nlm_xdr_dec_##restype, \
.p_arglen = NLM_##argtype##_sz, \ .p_arglen = NLM_##argtype##_sz, \
.p_replen = NLM_##restype##_sz, \ .p_replen = NLM_##restype##_sz, \
.p_statidx = NLMPROC_##proc, \ .p_statidx = NLMPROC_##proc, \
......
fs/lockd/mon.c
View file @ bf269551
...@@ -472,35 +472,35 @@ static void nsm_xdr_enc_unmon(struct rpc_rqst *req, struct xdr_stream *xdr, ...@@ -472,35 +472,35 @@ static void nsm_xdr_enc_unmon(struct rpc_rqst *req, struct xdr_stream *xdr,
encode_mon_id(xdr, argp); encode_mon_id(xdr, argp);
} }
static int xdr_dec_stat_res(struct rpc_rqst *rqstp, __be32 *p, static int nsm_xdr_dec_stat_res(struct rpc_rqst *rqstp,
struct nsm_res *resp) struct xdr_stream *xdr,
struct nsm_res *resp)
{ {
struct xdr_stream xdr; __be32 *p;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); p = xdr_inline_decode(xdr, 4 + 4);
p = xdr_inline_decode(&xdr, 4 + 4);
if (unlikely(p == NULL)) if (unlikely(p == NULL))
return -EIO; return -EIO;
resp->status = be32_to_cpup(p++); resp->status = be32_to_cpup(p++);
resp->state = be32_to_cpup(p); resp->state = be32_to_cpup(p);
dprintk("lockd: xdr_dec_stat_res status %d state %d\n", dprintk("lockd: %s status %d state %d\n",
resp->status, resp->state); __func__, resp->status, resp->state);
return 0; return 0;
} }
static int xdr_dec_stat(struct rpc_rqst *rqstp, __be32 *p, static int nsm_xdr_dec_stat(struct rpc_rqst *rqstp,
struct nsm_res *resp) struct xdr_stream *xdr,
struct nsm_res *resp)
{ {
struct xdr_stream xdr; __be32 *p;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); p = xdr_inline_decode(xdr, 4);
p = xdr_inline_decode(&xdr, 4);
if (unlikely(p == NULL)) if (unlikely(p == NULL))
return -EIO; return -EIO;
resp->state = be32_to_cpup(p); resp->state = be32_to_cpup(p);
dprintk("lockd: xdr_dec_stat state %d\n", resp->state); dprintk("lockd: %s state %d\n", __func__, resp->state);
return 0; return 0;
} }
...@@ -517,7 +517,7 @@ static struct rpc_procinfo nsm_procedures[] = { ...@@ -517,7 +517,7 @@ static struct rpc_procinfo nsm_procedures[] = {
[NSMPROC_MON] = { [NSMPROC_MON] = {
.p_proc = NSMPROC_MON, .p_proc = NSMPROC_MON,
.p_encode = (kxdreproc_t)nsm_xdr_enc_mon, .p_encode = (kxdreproc_t)nsm_xdr_enc_mon,
.p_decode = (kxdrproc_t)xdr_dec_stat_res, .p_decode = (kxdrdproc_t)nsm_xdr_dec_stat_res,
.p_arglen = SM_mon_sz, .p_arglen = SM_mon_sz,
.p_replen = SM_monres_sz, .p_replen = SM_monres_sz,
.p_statidx = NSMPROC_MON, .p_statidx = NSMPROC_MON,
...@@ -526,7 +526,7 @@ static struct rpc_procinfo nsm_procedures[] = { ...@@ -526,7 +526,7 @@ static struct rpc_procinfo nsm_procedures[] = {
[NSMPROC_UNMON] = { [NSMPROC_UNMON] = {
.p_proc = NSMPROC_UNMON, .p_proc = NSMPROC_UNMON,
.p_encode = (kxdreproc_t)nsm_xdr_enc_unmon, .p_encode = (kxdreproc_t)nsm_xdr_enc_unmon,
.p_decode = (kxdrproc_t)xdr_dec_stat, .p_decode = (kxdrdproc_t)nsm_xdr_dec_stat,
.p_arglen = SM_mon_id_sz, .p_arglen = SM_mon_id_sz,
.p_replen = SM_unmonres_sz, .p_replen = SM_unmonres_sz,
.p_statidx = NSMPROC_UNMON, .p_statidx = NSMPROC_UNMON,
......
fs/nfs/mount_clnt.c
View file @ bf269551
...@@ -340,18 +340,16 @@ static int decode_fhandle(struct xdr_stream *xdr, struct mountres *res) ...@@ -340,18 +340,16 @@ static int decode_fhandle(struct xdr_stream *xdr, struct mountres *res)
return 0; return 0;
} }
static int mnt_dec_mountres(struct rpc_rqst *req, __be32 *p, static int mnt_xdr_dec_mountres(struct rpc_rqst *req,
struct mountres *res) struct xdr_stream *xdr,
struct mountres *res)
{ {
struct xdr_stream xdr;
int status; int status;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); status = decode_status(xdr, res);
status = decode_status(&xdr, res);
if (unlikely(status != 0 || res->errno != 0)) if (unlikely(status != 0 || res->errno != 0))
return status; return status;
return decode_fhandle(&xdr, res); return decode_fhandle(xdr, res);
} }
static int decode_fhs_status(struct xdr_stream *xdr, struct mountres *res) static int decode_fhs_status(struct xdr_stream *xdr, struct mountres *res)
...@@ -434,30 +432,28 @@ static int decode_auth_flavors(struct xdr_stream *xdr, struct mountres *res) ...@@ -434,30 +432,28 @@ static int decode_auth_flavors(struct xdr_stream *xdr, struct mountres *res)
return 0; return 0;
} }
static int mnt_dec_mountres3(struct rpc_rqst *req, __be32 *p, static int mnt_xdr_dec_mountres3(struct rpc_rqst *req,
struct mountres *res) struct xdr_stream *xdr,
struct mountres *res)
{ {
struct xdr_stream xdr;
int status; int status;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); status = decode_fhs_status(xdr, res);
status = decode_fhs_status(&xdr, res);
if (unlikely(status != 0 || res->errno != 0)) if (unlikely(status != 0 || res->errno != 0))
return status; return status;
status = decode_fhandle3(&xdr, res); status = decode_fhandle3(xdr, res);
if (unlikely(status != 0)) { if (unlikely(status != 0)) {
res->errno = -EBADHANDLE; res->errno = -EBADHANDLE;
return 0; return 0;
} }
return decode_auth_flavors(&xdr, res); return decode_auth_flavors(xdr, res);
} }
static struct rpc_procinfo mnt_procedures[] = { static struct rpc_procinfo mnt_procedures[] = {
[MOUNTPROC_MNT] = { [MOUNTPROC_MNT] = {
.p_proc = MOUNTPROC_MNT, .p_proc = MOUNTPROC_MNT,
.p_encode = (kxdreproc_t)mnt_xdr_enc_dirpath, .p_encode = (kxdreproc_t)mnt_xdr_enc_dirpath,
.p_decode = (kxdrproc_t)mnt_dec_mountres, .p_decode = (kxdrdproc_t)mnt_xdr_dec_mountres,
.p_arglen = MNT_enc_dirpath_sz, .p_arglen = MNT_enc_dirpath_sz,
.p_replen = MNT_dec_mountres_sz, .p_replen = MNT_dec_mountres_sz,
.p_statidx = MOUNTPROC_MNT, .p_statidx = MOUNTPROC_MNT,
...@@ -476,7 +472,7 @@ static struct rpc_procinfo mnt3_procedures[] = { ...@@ -476,7 +472,7 @@ static struct rpc_procinfo mnt3_procedures[] = {
[MOUNTPROC3_MNT] = { [MOUNTPROC3_MNT] = {
.p_proc = MOUNTPROC3_MNT, .p_proc = MOUNTPROC3_MNT,
.p_encode = (kxdreproc_t)mnt_xdr_enc_dirpath, .p_encode = (kxdreproc_t)mnt_xdr_enc_dirpath,
.p_decode = (kxdrproc_t)mnt_dec_mountres3, .p_decode = (kxdrdproc_t)mnt_xdr_dec_mountres3,
.p_arglen = MNT_enc_dirpath_sz, .p_arglen = MNT_enc_dirpath_sz,
.p_replen = MNT_dec_mountres3_sz, .p_replen = MNT_dec_mountres3_sz,
.p_statidx = MOUNTPROC3_MNT, .p_statidx = MOUNTPROC3_MNT,
......
fs/nfs/nfs2xdr.c
View file @ bf269551
...@@ -783,15 +783,13 @@ static void nfs2_xdr_enc_readdirargs(struct rpc_rqst *req, ...@@ -783,15 +783,13 @@ static void nfs2_xdr_enc_readdirargs(struct rpc_rqst *req,
* "NFS: Network File System Protocol Specification". * "NFS: Network File System Protocol Specification".
*/ */
static int nfs2_xdr_dec_stat(struct rpc_rqst *req, __be32 *p, static int nfs2_xdr_dec_stat(struct rpc_rqst *req, struct xdr_stream *xdr,
void *__unused) void *__unused)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_stat(xdr, &status);
error = decode_stat(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS_OK) if (status != NFS_OK)
...@@ -802,22 +800,16 @@ static int nfs2_xdr_dec_stat(struct rpc_rqst *req, __be32 *p, ...@@ -802,22 +800,16 @@ static int nfs2_xdr_dec_stat(struct rpc_rqst *req, __be32 *p,
return nfs_stat_to_errno(status); return nfs_stat_to_errno(status);
} }
static int nfs2_xdr_dec_attrstat(struct rpc_rqst *req, __be32 *p, static int nfs2_xdr_dec_attrstat(struct rpc_rqst *req, struct xdr_stream *xdr,
struct nfs_fattr *result) struct nfs_fattr *result)
{ {
struct xdr_stream xdr; return decode_attrstat(xdr, result);
xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
return decode_attrstat(&xdr, result);
} }
static int nfs2_xdr_dec_diropres(struct rpc_rqst *req, __be32 *p, static int nfs2_xdr_dec_diropres(struct rpc_rqst *req, struct xdr_stream *xdr,
struct nfs_diropok *result) struct nfs_diropok *result)
{ {
struct xdr_stream xdr; return decode_diropres(xdr, result);
xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
return decode_diropres(&xdr, result);
} }
/* /*
...@@ -830,20 +822,18 @@ static int nfs2_xdr_dec_diropres(struct rpc_rqst *req, __be32 *p, ...@@ -830,20 +822,18 @@ static int nfs2_xdr_dec_diropres(struct rpc_rqst *req, __be32 *p,
* void; * void;
* }; * };
*/ */
static int nfs2_xdr_dec_readlinkres(struct rpc_rqst *req, __be32 *p, static int nfs2_xdr_dec_readlinkres(struct rpc_rqst *req,
void *__unused) struct xdr_stream *xdr, void *__unused)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_stat(xdr, &status);
error = decode_stat(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS_OK) if (status != NFS_OK)
goto out_default; goto out_default;
error = decode_path(&xdr); error = decode_path(xdr);
out: out:
return error; return error;
out_default: out_default:
...@@ -861,39 +851,33 @@ static int nfs2_xdr_dec_readlinkres(struct rpc_rqst *req, __be32 *p, ...@@ -861,39 +851,33 @@ static int nfs2_xdr_dec_readlinkres(struct rpc_rqst *req, __be32 *p,
* void; * void;
* }; * };
*/ */
static int nfs2_xdr_dec_readres(struct rpc_rqst *req, __be32 *p, static int nfs2_xdr_dec_readres(struct rpc_rqst *req, struct xdr_stream *xdr,
struct nfs_readres *result) struct nfs_readres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_stat(xdr, &status);
error = decode_stat(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS_OK) if (status != NFS_OK)
goto out_default; goto out_default;
error = decode_fattr(&xdr, result->fattr); error = decode_fattr(xdr, result->fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_nfsdata(&xdr, result); error = decode_nfsdata(xdr, result);
out: out:
return error; return error;
out_default: out_default:
return nfs_stat_to_errno(status); return nfs_stat_to_errno(status);
} }
static int nfs2_xdr_dec_writeres(struct rpc_rqst *req, __be32 *p, static int nfs2_xdr_dec_writeres(struct rpc_rqst *req, struct xdr_stream *xdr,
struct nfs_writeres *result) struct nfs_writeres *result)
{ {
struct xdr_stream xdr;
/* All NFSv2 writes are "file sync" writes */ /* All NFSv2 writes are "file sync" writes */
result->verf->committed = NFS_FILE_SYNC; result->verf->committed = NFS_FILE_SYNC;
return decode_attrstat(xdr, result->fattr);
xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
return decode_attrstat(&xdr, result->fattr);
} }
/** /**
...@@ -1008,20 +992,18 @@ static int decode_readdirok(struct xdr_stream *xdr) ...@@ -1008,20 +992,18 @@ static int decode_readdirok(struct xdr_stream *xdr)
goto out; goto out;
} }
static int nfs2_xdr_dec_readdirres(struct rpc_rqst *req, __be32 *p, static int nfs2_xdr_dec_readdirres(struct rpc_rqst *req,
void *__unused) struct xdr_stream *xdr, void *__unused)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_stat(xdr, &status);
error = decode_stat(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS_OK) if (status != NFS_OK)
goto out_default; goto out_default;
error = decode_readdirok(&xdr); error = decode_readdirok(xdr);
out: out:
return error; return error;
out_default: out_default:
...@@ -1062,20 +1044,18 @@ static int decode_info(struct xdr_stream *xdr, struct nfs2_fsstat *result) ...@@ -1062,20 +1044,18 @@ static int decode_info(struct xdr_stream *xdr, struct nfs2_fsstat *result)
return -EIO; return -EIO;
} }
static int nfs2_xdr_dec_statfsres(struct rpc_rqst *req, __be32 *p, static int nfs2_xdr_dec_statfsres(struct rpc_rqst *req, struct xdr_stream *xdr,
struct nfs2_fsstat *result) struct nfs2_fsstat *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_stat(xdr, &status);
error = decode_stat(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS_OK) if (status != NFS_OK)
goto out_default; goto out_default;
error = decode_info(&xdr, result); error = decode_info(xdr, result);
out: out:
return error; return error;
out_default: out_default:
...@@ -1150,7 +1130,7 @@ int nfs_stat_to_errno(enum nfs_stat status) ...@@ -1150,7 +1130,7 @@ int nfs_stat_to_errno(enum nfs_stat status)
[NFSPROC_##proc] = { \ [NFSPROC_##proc] = { \
.p_proc = NFSPROC_##proc, \ .p_proc = NFSPROC_##proc, \
.p_encode = (kxdreproc_t)nfs2_xdr_enc_##argtype, \ .p_encode = (kxdreproc_t)nfs2_xdr_enc_##argtype, \
.p_decode = (kxdrproc_t)nfs2_xdr_dec_##restype, \ .p_decode = (kxdrdproc_t)nfs2_xdr_dec_##restype, \
.p_arglen = NFS_##argtype##_sz, \ .p_arglen = NFS_##argtype##_sz, \
.p_replen = NFS_##restype##_sz, \ .p_replen = NFS_##restype##_sz, \
.p_timer = timer, \ .p_timer = timer, \
......
fs/nfs/nfs3xdr.c
View file @ bf269551
...@@ -1366,20 +1366,19 @@ static void nfs3_xdr_enc_setacl3args(struct rpc_rqst *req, ...@@ -1366,20 +1366,19 @@ static void nfs3_xdr_enc_setacl3args(struct rpc_rqst *req,
* void; * void;
* }; * };
*/ */
static int nfs3_xdr_dec_getattr3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_getattr3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs_fattr *result) struct nfs_fattr *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_default; goto out_default;
error = decode_fattr3(&xdr, result); error = decode_fattr3(xdr, result);
out: out:
return error; return error;
out_default: out_default:
...@@ -1404,18 +1403,17 @@ static int nfs3_xdr_dec_getattr3res(struct rpc_rqst *req, __be32 *p, ...@@ -1404,18 +1403,17 @@ static int nfs3_xdr_dec_getattr3res(struct rpc_rqst *req, __be32 *p,
* SETATTR3resfail resfail; * SETATTR3resfail resfail;
* }; * };
*/ */
static int nfs3_xdr_dec_setattr3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_setattr3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs_fattr *result) struct nfs_fattr *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_wcc_data(&xdr, result); error = decode_wcc_data(xdr, result);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
...@@ -1446,30 +1444,29 @@ static int nfs3_xdr_dec_setattr3res(struct rpc_rqst *req, __be32 *p, ...@@ -1446,30 +1444,29 @@ static int nfs3_xdr_dec_setattr3res(struct rpc_rqst *req, __be32 *p,
* LOOKUP3resfail resfail; * LOOKUP3resfail resfail;
* }; * };
*/ */
static int nfs3_xdr_dec_lookup3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_lookup3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs3_diropres *result) struct nfs3_diropres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_default; goto out_default;
error = decode_nfs_fh3(&xdr, result->fh); error = decode_nfs_fh3(xdr, result->fh);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_post_op_attr(&xdr, result->fattr); error = decode_post_op_attr(xdr, result->fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_post_op_attr(&xdr, result->dir_attr); error = decode_post_op_attr(xdr, result->dir_attr);
out: out:
return error; return error;
out_default: out_default:
error = decode_post_op_attr(&xdr, result->dir_attr); error = decode_post_op_attr(xdr, result->dir_attr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
return nfs_stat_to_errno(status); return nfs_stat_to_errno(status);
...@@ -1494,23 +1491,22 @@ static int nfs3_xdr_dec_lookup3res(struct rpc_rqst *req, __be32 *p, ...@@ -1494,23 +1491,22 @@ static int nfs3_xdr_dec_lookup3res(struct rpc_rqst *req, __be32 *p,
* ACCESS3resfail resfail; * ACCESS3resfail resfail;
* }; * };
*/ */
static int nfs3_xdr_dec_access3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_access3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs3_accessres *result) struct nfs3_accessres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_post_op_attr(&xdr, result->fattr); error = decode_post_op_attr(xdr, result->fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_default; goto out_default;
error = decode_uint32(&xdr, &result->access); error = decode_uint32(xdr, &result->access);
out: out:
return error; return error;
out_default: out_default:
...@@ -1536,23 +1532,22 @@ static int nfs3_xdr_dec_access3res(struct rpc_rqst *req, __be32 *p, ...@@ -1536,23 +1532,22 @@ static int nfs3_xdr_dec_access3res(struct rpc_rqst *req, __be32 *p,
* READLINK3resfail resfail; * READLINK3resfail resfail;
* }; * };
*/ */
static int nfs3_xdr_dec_readlink3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_readlink3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs_fattr *result) struct nfs_fattr *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_post_op_attr(&xdr, result); error = decode_post_op_attr(xdr, result);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_default; goto out_default;
error = decode_nfspath3(&xdr); error = decode_nfspath3(xdr);
out: out:
return error; return error;
out_default: out_default:
...@@ -1620,23 +1615,21 @@ static int decode_read3resok(struct xdr_stream *xdr, ...@@ -1620,23 +1615,21 @@ static int decode_read3resok(struct xdr_stream *xdr,
return -EIO; return -EIO;
} }
static int nfs3_xdr_dec_read3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_read3res(struct rpc_rqst *req, struct xdr_stream *xdr,
struct nfs_readres *result) struct nfs_readres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_post_op_attr(&xdr, result->fattr); error = decode_post_op_attr(xdr, result->fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_status; goto out_status;
error = decode_read3resok(&xdr, result); error = decode_read3resok(xdr, result);
out: out:
return error; return error;
out_status: out_status:
...@@ -1692,23 +1685,21 @@ static int decode_write3resok(struct xdr_stream *xdr, ...@@ -1692,23 +1685,21 @@ static int decode_write3resok(struct xdr_stream *xdr,
return -EIO; return -EIO;
} }
static int nfs3_xdr_dec_write3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_write3res(struct rpc_rqst *req, struct xdr_stream *xdr,
struct nfs_writeres *result) struct nfs_writeres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_wcc_data(&xdr, result->fattr); error = decode_wcc_data(xdr, result->fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_status; goto out_status;
error = decode_write3resok(&xdr, result); error = decode_write3resok(xdr, result);
out: out:
return error; return error;
out_status: out_status:
...@@ -1757,24 +1748,23 @@ static int decode_create3resok(struct xdr_stream *xdr, ...@@ -1757,24 +1748,23 @@ static int decode_create3resok(struct xdr_stream *xdr,
return error; return error;
} }
static int nfs3_xdr_dec_create3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_create3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs3_diropres *result) struct nfs3_diropres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_default; goto out_default;
error = decode_create3resok(&xdr, result); error = decode_create3resok(xdr, result);
out: out:
return error; return error;
out_default: out_default:
error = decode_wcc_data(&xdr, result->dir_attr); error = decode_wcc_data(xdr, result->dir_attr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
return nfs_stat_to_errno(status); return nfs_stat_to_errno(status);
...@@ -1798,18 +1788,17 @@ static int nfs3_xdr_dec_create3res(struct rpc_rqst *req, __be32 *p, ...@@ -1798,18 +1788,17 @@ static int nfs3_xdr_dec_create3res(struct rpc_rqst *req, __be32 *p,
* REMOVE3resfail resfail; * REMOVE3resfail resfail;
* }; * };
*/ */
static int nfs3_xdr_dec_remove3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_remove3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs_removeres *result) struct nfs_removeres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_wcc_data(&xdr, result->dir_attr); error = decode_wcc_data(xdr, result->dir_attr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
...@@ -1840,21 +1829,20 @@ static int nfs3_xdr_dec_remove3res(struct rpc_rqst *req, __be32 *p, ...@@ -1840,21 +1829,20 @@ static int nfs3_xdr_dec_remove3res(struct rpc_rqst *req, __be32 *p,
* RENAME3resfail resfail; * RENAME3resfail resfail;
* }; * };
*/ */
static int nfs3_xdr_dec_rename3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_rename3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs_renameres *result) struct nfs_renameres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_wcc_data(&xdr, result->old_fattr); error = decode_wcc_data(xdr, result->old_fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_wcc_data(&xdr, result->new_fattr); error = decode_wcc_data(xdr, result->new_fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
...@@ -1885,21 +1873,19 @@ static int nfs3_xdr_dec_rename3res(struct rpc_rqst *req, __be32 *p, ...@@ -1885,21 +1873,19 @@ static int nfs3_xdr_dec_rename3res(struct rpc_rqst *req, __be32 *p,
* LINK3resfail resfail; * LINK3resfail resfail;
* }; * };
*/ */
static int nfs3_xdr_dec_link3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_link3res(struct rpc_rqst *req, struct xdr_stream *xdr,
struct nfs3_linkres *result) struct nfs3_linkres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_post_op_attr(&xdr, result->fattr); error = decode_post_op_attr(xdr, result->fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_wcc_data(&xdr, result->dir_attr); error = decode_wcc_data(xdr, result->dir_attr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
...@@ -2085,24 +2071,23 @@ static int decode_readdir3resok(struct xdr_stream *xdr, ...@@ -2085,24 +2071,23 @@ static int decode_readdir3resok(struct xdr_stream *xdr,
return error; return error;
} }
static int nfs3_xdr_dec_readdir3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_readdir3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs3_readdirres *result) struct nfs3_readdirres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_default; goto out_default;
error = decode_readdir3resok(&xdr, result); error = decode_readdir3resok(xdr, result);
out: out:
return error; return error;
out_default: out_default:
error = decode_post_op_attr(&xdr, result->dir_attr); error = decode_post_op_attr(xdr, result->dir_attr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
return nfs_stat_to_errno(status); return nfs_stat_to_errno(status);
...@@ -2154,23 +2139,22 @@ static int decode_fsstat3resok(struct xdr_stream *xdr, ...@@ -2154,23 +2139,22 @@ static int decode_fsstat3resok(struct xdr_stream *xdr,
return -EIO; return -EIO;
} }
static int nfs3_xdr_dec_fsstat3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_fsstat3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs_fsstat *result) struct nfs_fsstat *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_post_op_attr(&xdr, result->fattr); error = decode_post_op_attr(xdr, result->fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_status; goto out_status;
error = decode_fsstat3resok(&xdr, result); error = decode_fsstat3resok(xdr, result);
out: out:
return error; return error;
out_status: out_status:
...@@ -2231,23 +2215,22 @@ static int decode_fsinfo3resok(struct xdr_stream *xdr, ...@@ -2231,23 +2215,22 @@ static int decode_fsinfo3resok(struct xdr_stream *xdr,
return -EIO; return -EIO;
} }
static int nfs3_xdr_dec_fsinfo3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_fsinfo3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs_fsinfo *result) struct nfs_fsinfo *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_post_op_attr(&xdr, result->fattr); error = decode_post_op_attr(xdr, result->fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_status; goto out_status;
error = decode_fsinfo3resok(&xdr, result); error = decode_fsinfo3resok(xdr, result);
out: out:
return error; return error;
out_status: out_status:
...@@ -2295,23 +2278,22 @@ static int decode_pathconf3resok(struct xdr_stream *xdr, ...@@ -2295,23 +2278,22 @@ static int decode_pathconf3resok(struct xdr_stream *xdr,
return -EIO; return -EIO;
} }
static int nfs3_xdr_dec_pathconf3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_pathconf3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs_pathconf *result) struct nfs_pathconf *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_post_op_attr(&xdr, result->fattr); error = decode_post_op_attr(xdr, result->fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_status; goto out_status;
error = decode_pathconf3resok(&xdr, result); error = decode_pathconf3resok(xdr, result);
out: out:
return error; return error;
out_status: out_status:
...@@ -2337,23 +2319,22 @@ static int nfs3_xdr_dec_pathconf3res(struct rpc_rqst *req, __be32 *p, ...@@ -2337,23 +2319,22 @@ static int nfs3_xdr_dec_pathconf3res(struct rpc_rqst *req, __be32 *p,
* COMMIT3resfail resfail; * COMMIT3resfail resfail;
* }; * };
*/ */
static int nfs3_xdr_dec_commit3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_commit3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs_writeres *result) struct nfs_writeres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
error = decode_wcc_data(&xdr, result->fattr); error = decode_wcc_data(xdr, result->fattr);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_status; goto out_status;
error = decode_writeverf3(&xdr, result->verf->verifier); error = decode_writeverf3(xdr, result->verf->verifier);
out: out:
return error; return error;
out_status: out_status:
...@@ -2406,40 +2387,38 @@ static inline int decode_getacl3resok(struct xdr_stream *xdr, ...@@ -2406,40 +2387,38 @@ static inline int decode_getacl3resok(struct xdr_stream *xdr,
return error; return error;
} }
static int nfs3_xdr_dec_getacl3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_getacl3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs3_getaclres *result) struct nfs3_getaclres *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_default; goto out_default;
error = decode_getacl3resok(&xdr, result); error = decode_getacl3resok(xdr, result);
out: out:
return error; return error;
out_default: out_default:
return nfs_stat_to_errno(status); return nfs_stat_to_errno(status);
} }
static int nfs3_xdr_dec_setacl3res(struct rpc_rqst *req, __be32 *p, static int nfs3_xdr_dec_setacl3res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs_fattr *result) struct nfs_fattr *result)
{ {
struct xdr_stream xdr;
enum nfs_stat status; enum nfs_stat status;
int error; int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); error = decode_nfsstat3(xdr, &status);
error = decode_nfsstat3(&xdr, &status);
if (unlikely(error)) if (unlikely(error))
goto out; goto out;
if (status != NFS3_OK) if (status != NFS3_OK)
goto out_default; goto out_default;
error = decode_post_op_attr(&xdr, result); error = decode_post_op_attr(xdr, result);
out: out:
return error; return error;
out_default: out_default:
...@@ -2452,7 +2431,7 @@ static int nfs3_xdr_dec_setacl3res(struct rpc_rqst *req, __be32 *p, ...@@ -2452,7 +2431,7 @@ static int nfs3_xdr_dec_setacl3res(struct rpc_rqst *req, __be32 *p,
[NFS3PROC_##proc] = { \ [NFS3PROC_##proc] = { \
.p_proc = NFS3PROC_##proc, \ .p_proc = NFS3PROC_##proc, \
.p_encode = (kxdreproc_t)nfs3_xdr_enc_##argtype##3args, \ .p_encode = (kxdreproc_t)nfs3_xdr_enc_##argtype##3args, \
.p_decode = (kxdrproc_t)nfs3_xdr_dec_##restype##3res, \ .p_decode = (kxdrdproc_t)nfs3_xdr_dec_##restype##3res, \
.p_arglen = NFS3_##argtype##args_sz, \ .p_arglen = NFS3_##argtype##args_sz, \
.p_replen = NFS3_##restype##res_sz, \ .p_replen = NFS3_##restype##res_sz, \
.p_timer = timer, \ .p_timer = timer, \
...@@ -2495,7 +2474,7 @@ static struct rpc_procinfo nfs3_acl_procedures[] = { ...@@ -2495,7 +2474,7 @@ static struct rpc_procinfo nfs3_acl_procedures[] = {
[ACLPROC3_GETACL] = { [ACLPROC3_GETACL] = {
.p_proc = ACLPROC3_GETACL, .p_proc = ACLPROC3_GETACL,
.p_encode = (kxdreproc_t)nfs3_xdr_enc_getacl3args, .p_encode = (kxdreproc_t)nfs3_xdr_enc_getacl3args,
.p_decode = (kxdrproc_t)nfs3_xdr_dec_getacl3res, .p_decode = (kxdrdproc_t)nfs3_xdr_dec_getacl3res,
.p_arglen = ACL3_getaclargs_sz, .p_arglen = ACL3_getaclargs_sz,
.p_replen = ACL3_getaclres_sz, .p_replen = ACL3_getaclres_sz,
.p_timer = 1, .p_timer = 1,
...@@ -2504,7 +2483,7 @@ static struct rpc_procinfo nfs3_acl_procedures[] = { ...@@ -2504,7 +2483,7 @@ static struct rpc_procinfo nfs3_acl_procedures[] = {
[ACLPROC3_SETACL] = { [ACLPROC3_SETACL] = {
.p_proc = ACLPROC3_SETACL, .p_proc = ACLPROC3_SETACL,
.p_encode = (kxdreproc_t)nfs3_xdr_enc_setacl3args, .p_encode = (kxdreproc_t)nfs3_xdr_enc_setacl3args,
.p_decode = (kxdrproc_t)nfs3_xdr_dec_setacl3res, .p_decode = (kxdrdproc_t)nfs3_xdr_dec_setacl3res,
.p_arglen = ACL3_setaclargs_sz, .p_arglen = ACL3_setaclargs_sz,
.p_replen = ACL3_setaclres_sz, .p_replen = ACL3_setaclres_sz,
.p_timer = 0, .p_timer = 0,
......
fs/nfs/nfs4xdr.c
View file @ bf269551
...@@ -5013,26 +5013,26 @@ static int decode_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req, ...@@ -5013,26 +5013,26 @@ static int decode_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req,
/* /*
* Decode OPEN_DOWNGRADE response * Decode OPEN_DOWNGRADE response
*/ */
static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, __be32 *p, struct nfs_closeres *res) static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs_closeres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_open_downgrade(&xdr, res); status = decode_open_downgrade(xdr, res);
if (status != 0) if (status != 0)
goto out; goto out;
decode_getfattr(&xdr, res->fattr, res->server, decode_getfattr(xdr, res->fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5041,26 +5041,25 @@ static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, __be32 *p, struct ...@@ -5041,26 +5041,25 @@ static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, __be32 *p, struct
/* /*
* Decode ACCESS response * Decode ACCESS response
*/ */
static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_accessres *res) static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs4_accessres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status != 0) if (status != 0)
goto out; goto out;
status = decode_access(&xdr, res); status = decode_access(xdr, res);
if (status != 0) if (status != 0)
goto out; goto out;
decode_getfattr(&xdr, res->fattr, res->server, decode_getfattr(xdr, res->fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5069,26 +5068,28 @@ static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_ac ...@@ -5069,26 +5068,28 @@ static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_ac
/* /*
* Decode LOOKUP response * Decode LOOKUP response
*/ */
static int nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_lookup_res *res) static int nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs4_lookup_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
if ((status = decode_putfh(&xdr)) != 0) status = decode_putfh(xdr);
if (status)
goto out; goto out;
if ((status = decode_lookup(&xdr)) != 0) status = decode_lookup(xdr);
if (status)
goto out; goto out;
if ((status = decode_getfh(&xdr, res->fh)) != 0) status = decode_getfh(xdr, res->fh);
if (status)
goto out; goto out;
status = decode_getfattr(&xdr, res->fattr, res->server status = decode_getfattr(xdr, res->fattr, res->server
,!RPC_IS_ASYNC(rqstp->rq_task)); ,!RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5097,23 +5098,25 @@ static int nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_lo ...@@ -5097,23 +5098,25 @@ static int nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_lo
/* /*
* Decode LOOKUP_ROOT response * Decode LOOKUP_ROOT response
*/ */
static int nfs4_xdr_dec_lookup_root(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_lookup_res *res) static int nfs4_xdr_dec_lookup_root(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs4_lookup_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
if ((status = decode_putrootfh(&xdr)) != 0) status = decode_putrootfh(xdr);
if (status)
goto out; goto out;
if ((status = decode_getfh(&xdr, res->fh)) == 0) status = decode_getfh(xdr, res->fh);
status = decode_getfattr(&xdr, res->fattr, res->server, if (status == 0)
status = decode_getfattr(xdr, res->fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5122,24 +5125,25 @@ static int nfs4_xdr_dec_lookup_root(struct rpc_rqst *rqstp, __be32 *p, struct nf ...@@ -5122,24 +5125,25 @@ static int nfs4_xdr_dec_lookup_root(struct rpc_rqst *rqstp, __be32 *p, struct nf
/* /*
* Decode REMOVE response * Decode REMOVE response
*/ */
static int nfs4_xdr_dec_remove(struct rpc_rqst *rqstp, __be32 *p, struct nfs_removeres *res) static int nfs4_xdr_dec_remove(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_removeres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
if ((status = decode_putfh(&xdr)) != 0) status = decode_putfh(xdr);
if (status)
goto out; goto out;
if ((status = decode_remove(&xdr, &res->cinfo)) != 0) status = decode_remove(xdr, &res->cinfo);
if (status)
goto out; goto out;
decode_getfattr(&xdr, res->dir_attr, res->server, decode_getfattr(xdr, res->dir_attr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5148,34 +5152,38 @@ static int nfs4_xdr_dec_remove(struct rpc_rqst *rqstp, __be32 *p, struct nfs_rem ...@@ -5148,34 +5152,38 @@ static int nfs4_xdr_dec_remove(struct rpc_rqst *rqstp, __be32 *p, struct nfs_rem
/* /*
* Decode RENAME response * Decode RENAME response
*/ */
static int nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, __be32 *p, struct nfs_renameres *res) static int nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_renameres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
if ((status = decode_putfh(&xdr)) != 0) status = decode_putfh(xdr);
if (status)
goto out; goto out;
if ((status = decode_savefh(&xdr)) != 0) status = decode_savefh(xdr);
if (status)
goto out; goto out;
if ((status = decode_putfh(&xdr)) != 0) status = decode_putfh(xdr);
if (status)
goto out; goto out;
if ((status = decode_rename(&xdr, &res->old_cinfo, &res->new_cinfo)) != 0) status = decode_rename(xdr, &res->old_cinfo, &res->new_cinfo);
if (status)
goto out; goto out;
/* Current FH is target directory */ /* Current FH is target directory */
if (decode_getfattr(&xdr, res->new_fattr, res->server, if (decode_getfattr(xdr, res->new_fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)) != 0) !RPC_IS_ASYNC(rqstp->rq_task)) != 0)
goto out; goto out;
if ((status = decode_restorefh(&xdr)) != 0) status = decode_restorefh(xdr);
if (status)
goto out; goto out;
decode_getfattr(&xdr, res->old_fattr, res->server, decode_getfattr(xdr, res->old_fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5184,37 +5192,41 @@ static int nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, __be32 *p, struct nfs_ren ...@@ -5184,37 +5192,41 @@ static int nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, __be32 *p, struct nfs_ren
/* /*
* Decode LINK response * Decode LINK response
*/ */
static int nfs4_xdr_dec_link(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_link_res *res) static int nfs4_xdr_dec_link(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs4_link_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
if ((status = decode_putfh(&xdr)) != 0) status = decode_putfh(xdr);
if (status)
goto out; goto out;
if ((status = decode_savefh(&xdr)) != 0) status = decode_savefh(xdr);
if (status)
goto out; goto out;
if ((status = decode_putfh(&xdr)) != 0) status = decode_putfh(xdr);
if (status)
goto out; goto out;
if ((status = decode_link(&xdr, &res->cinfo)) != 0) status = decode_link(xdr, &res->cinfo);
if (status)
goto out; goto out;
/* /*
* Note order: OP_LINK leaves the directory as the current * Note order: OP_LINK leaves the directory as the current
* filehandle. * filehandle.
*/ */
if (decode_getfattr(&xdr, res->dir_attr, res->server, if (decode_getfattr(xdr, res->dir_attr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)) != 0) !RPC_IS_ASYNC(rqstp->rq_task)) != 0)
goto out; goto out;
if ((status = decode_restorefh(&xdr)) != 0) status = decode_restorefh(xdr);
if (status)
goto out; goto out;
decode_getfattr(&xdr, res->fattr, res->server, decode_getfattr(xdr, res->fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5223,33 +5235,37 @@ static int nfs4_xdr_dec_link(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_link ...@@ -5223,33 +5235,37 @@ static int nfs4_xdr_dec_link(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_link
/* /*
* Decode CREATE response * Decode CREATE response
*/ */
static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_create_res *res) static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs4_create_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
if ((status = decode_putfh(&xdr)) != 0) status = decode_putfh(xdr);
if (status)
goto out; goto out;
if ((status = decode_savefh(&xdr)) != 0) status = decode_savefh(xdr);
if (status)
goto out; goto out;
if ((status = decode_create(&xdr,&res->dir_cinfo)) != 0) status = decode_create(xdr, &res->dir_cinfo);
if (status)
goto out; goto out;
if ((status = decode_getfh(&xdr, res->fh)) != 0) status = decode_getfh(xdr, res->fh);
if (status)
goto out; goto out;
if (decode_getfattr(&xdr, res->fattr, res->server, if (decode_getfattr(xdr, res->fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)) != 0) !RPC_IS_ASYNC(rqstp->rq_task)) != 0)
goto out; goto out;
if ((status = decode_restorefh(&xdr)) != 0) status = decode_restorefh(xdr);
if (status)
goto out; goto out;
decode_getfattr(&xdr, res->dir_fattr, res->server, decode_getfattr(xdr, res->dir_fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5258,31 +5274,31 @@ static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_cr ...@@ -5258,31 +5274,31 @@ static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_cr
/* /*
* Decode SYMLINK response * Decode SYMLINK response
*/ */
static int nfs4_xdr_dec_symlink(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_create_res *res) static int nfs4_xdr_dec_symlink(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs4_create_res *res)
{ {
return nfs4_xdr_dec_create(rqstp, p, res); return nfs4_xdr_dec_create(rqstp, xdr, res);
} }
/* /*
* Decode GETATTR response * Decode GETATTR response
*/ */
static int nfs4_xdr_dec_getattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_getattr_res *res) static int nfs4_xdr_dec_getattr(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs4_getattr_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_getfattr(&xdr, res->fattr, res->server, status = decode_getfattr(xdr, res->fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5309,24 +5325,22 @@ static void nfs4_xdr_enc_setacl(struct rpc_rqst *req, struct xdr_stream *xdr, ...@@ -5309,24 +5325,22 @@ static void nfs4_xdr_enc_setacl(struct rpc_rqst *req, struct xdr_stream *xdr,
* Decode SETACL response * Decode SETACL response
*/ */
static int static int
nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p, nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_setaclres *res) struct nfs_setaclres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_setattr(&xdr); status = decode_setattr(xdr);
out: out:
return status; return status;
} }
...@@ -5335,24 +5349,22 @@ nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p, ...@@ -5335,24 +5349,22 @@ nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p,
* Decode GETACL response * Decode GETACL response
*/ */
static int static int
nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, __be32 *p, nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_getaclres *res) struct nfs_getaclres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_getacl(&xdr, rqstp, &res->acl_len); status = decode_getacl(xdr, rqstp, &res->acl_len);
out: out:
return status; return status;
...@@ -5361,23 +5373,22 @@ nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, __be32 *p, ...@@ -5361,23 +5373,22 @@ nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, __be32 *p,
/* /*
* Decode CLOSE response * Decode CLOSE response
*/ */
static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, __be32 *p, struct nfs_closeres *res) static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_closeres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_close(&xdr, res); status = decode_close(xdr, res);
if (status != 0) if (status != 0)
goto out; goto out;
/* /*
...@@ -5386,7 +5397,7 @@ static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, __be32 *p, struct nfs_clos ...@@ -5386,7 +5397,7 @@ static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, __be32 *p, struct nfs_clos
* an ESTALE error. Shouldn't be a problem, * an ESTALE error. Shouldn't be a problem,
* though, since fattr->valid will remain unset. * though, since fattr->valid will remain unset.
*/ */
decode_getfattr(&xdr, res->fattr, res->server, decode_getfattr(xdr, res->fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5395,36 +5406,35 @@ static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, __be32 *p, struct nfs_clos ...@@ -5395,36 +5406,35 @@ static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, __be32 *p, struct nfs_clos
/* /*
* Decode OPEN response * Decode OPEN response
*/ */
static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, __be32 *p, struct nfs_openres *res) static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_openres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_savefh(&xdr); status = decode_savefh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_open(&xdr, res); status = decode_open(xdr, res);
if (status) if (status)
goto out; goto out;
if (decode_getfh(&xdr, &res->fh) != 0) if (decode_getfh(xdr, &res->fh) != 0)
goto out; goto out;
if (decode_getfattr(&xdr, res->f_attr, res->server, if (decode_getfattr(xdr, res->f_attr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)) != 0) !RPC_IS_ASYNC(rqstp->rq_task)) != 0)
goto out; goto out;
if (decode_restorefh(&xdr) != 0) if (decode_restorefh(xdr) != 0)
goto out; goto out;
decode_getfattr(&xdr, res->dir_attr, res->server, decode_getfattr(xdr, res->dir_attr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5433,20 +5443,20 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, __be32 *p, struct nfs_openr ...@@ -5433,20 +5443,20 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, __be32 *p, struct nfs_openr
/* /*
* Decode OPEN_CONFIRM response * Decode OPEN_CONFIRM response
*/ */
static int nfs4_xdr_dec_open_confirm(struct rpc_rqst *rqstp, __be32 *p, struct nfs_open_confirmres *res) static int nfs4_xdr_dec_open_confirm(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs_open_confirmres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_open_confirm(&xdr, res); status = decode_open_confirm(xdr, res);
out: out:
return status; return status;
} }
...@@ -5454,26 +5464,26 @@ static int nfs4_xdr_dec_open_confirm(struct rpc_rqst *rqstp, __be32 *p, struct n ...@@ -5454,26 +5464,26 @@ static int nfs4_xdr_dec_open_confirm(struct rpc_rqst *rqstp, __be32 *p, struct n
/* /*
* Decode OPEN response * Decode OPEN response
*/ */
static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs_openres *res) static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs_openres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_open(&xdr, res); status = decode_open(xdr, res);
if (status) if (status)
goto out; goto out;
decode_getfattr(&xdr, res->f_attr, res->server, decode_getfattr(xdr, res->f_attr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5482,26 +5492,26 @@ static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp, __be32 *p, struct nf ...@@ -5482,26 +5492,26 @@ static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp, __be32 *p, struct nf
/* /*
* Decode SETATTR response * Decode SETATTR response
*/ */
static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs_setattrres *res) static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs_setattrres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_setattr(&xdr); status = decode_setattr(xdr);
if (status) if (status)
goto out; goto out;
decode_getfattr(&xdr, res->fattr, res->server, decode_getfattr(xdr, res->fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5510,23 +5520,22 @@ static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs_se ...@@ -5510,23 +5520,22 @@ static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs_se
/* /*
* Decode LOCK response * Decode LOCK response
*/ */
static int nfs4_xdr_dec_lock(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lock_res *res) static int nfs4_xdr_dec_lock(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_lock_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_lock(&xdr, res); status = decode_lock(xdr, res);
out: out:
return status; return status;
} }
...@@ -5534,23 +5543,22 @@ static int nfs4_xdr_dec_lock(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lock_ ...@@ -5534,23 +5543,22 @@ static int nfs4_xdr_dec_lock(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lock_
/* /*
* Decode LOCKT response * Decode LOCKT response
*/ */
static int nfs4_xdr_dec_lockt(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lockt_res *res) static int nfs4_xdr_dec_lockt(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_lockt_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_lockt(&xdr, res); status = decode_lockt(xdr, res);
out: out:
return status; return status;
} }
...@@ -5558,61 +5566,58 @@ static int nfs4_xdr_dec_lockt(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lock ...@@ -5558,61 +5566,58 @@ static int nfs4_xdr_dec_lockt(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lock
/* /*
* Decode LOCKU response * Decode LOCKU response
*/ */
static int nfs4_xdr_dec_locku(struct rpc_rqst *rqstp, __be32 *p, struct nfs_locku_res *res) static int nfs4_xdr_dec_locku(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_locku_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_locku(&xdr, res); status = decode_locku(xdr, res);
out: out:
return status; return status;
} }
static int nfs4_xdr_dec_release_lockowner(struct rpc_rqst *rqstp, __be32 *p, void *dummy) static int nfs4_xdr_dec_release_lockowner(struct rpc_rqst *rqstp,
struct xdr_stream *xdr, void *dummy)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_release_lockowner(&xdr); status = decode_release_lockowner(xdr);
return status; return status;
} }
/* /*
* Decode READLINK response * Decode READLINK response
*/ */
static int nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp, __be32 *p, static int nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs4_readlink_res *res) struct nfs4_readlink_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_readlink(&xdr, rqstp); status = decode_readlink(xdr, rqstp);
out: out:
return status; return status;
} }
...@@ -5620,23 +5625,22 @@ static int nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp, __be32 *p, ...@@ -5620,23 +5625,22 @@ static int nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp, __be32 *p,
/* /*
* Decode READDIR response * Decode READDIR response
*/ */
static int nfs4_xdr_dec_readdir(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_readdir_res *res) static int nfs4_xdr_dec_readdir(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs4_readdir_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_readdir(&xdr, rqstp, res); status = decode_readdir(xdr, rqstp, res);
out: out:
return status; return status;
} }
...@@ -5644,23 +5648,22 @@ static int nfs4_xdr_dec_readdir(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_r ...@@ -5644,23 +5648,22 @@ static int nfs4_xdr_dec_readdir(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_r
/* /*
* Decode Read response * Decode Read response
*/ */
static int nfs4_xdr_dec_read(struct rpc_rqst *rqstp, __be32 *p, struct nfs_readres *res) static int nfs4_xdr_dec_read(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_readres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_read(&xdr, rqstp, res); status = decode_read(xdr, rqstp, res);
if (!status) if (!status)
status = res->count; status = res->count;
out: out:
...@@ -5670,26 +5673,25 @@ static int nfs4_xdr_dec_read(struct rpc_rqst *rqstp, __be32 *p, struct nfs_readr ...@@ -5670,26 +5673,25 @@ static int nfs4_xdr_dec_read(struct rpc_rqst *rqstp, __be32 *p, struct nfs_readr
/* /*
* Decode WRITE response * Decode WRITE response
*/ */
static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, __be32 *p, struct nfs_writeres *res) static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_writeres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_write(&xdr, res); status = decode_write(xdr, res);
if (status) if (status)
goto out; goto out;
decode_getfattr(&xdr, res->fattr, res->server, decode_getfattr(xdr, res->fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
if (!status) if (!status)
status = res->count; status = res->count;
...@@ -5700,26 +5702,25 @@ static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, __be32 *p, struct nfs_writ ...@@ -5700,26 +5702,25 @@ static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, __be32 *p, struct nfs_writ
/* /*
* Decode COMMIT response * Decode COMMIT response
*/ */
static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, __be32 *p, struct nfs_writeres *res) static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
struct nfs_writeres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_commit(&xdr, res); status = decode_commit(xdr, res);
if (status) if (status)
goto out; goto out;
decode_getfattr(&xdr, res->fattr, res->server, decode_getfattr(xdr, res->fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5728,85 +5729,80 @@ static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, __be32 *p, struct nfs_wri ...@@ -5728,85 +5729,80 @@ static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, __be32 *p, struct nfs_wri
/* /*
* Decode FSINFO response * Decode FSINFO response
*/ */
static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, __be32 *p, static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, struct xdr_stream *xdr,
struct nfs4_fsinfo_res *res) struct nfs4_fsinfo_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_sequence(&xdr, &res->seq_res, req); status = decode_sequence(xdr, &res->seq_res, req);
if (!status) if (!status)
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (!status) if (!status)
status = decode_fsinfo(&xdr, res->fsinfo); status = decode_fsinfo(xdr, res->fsinfo);
return status; return status;
} }
/* /*
* Decode PATHCONF response * Decode PATHCONF response
*/ */
static int nfs4_xdr_dec_pathconf(struct rpc_rqst *req, __be32 *p, static int nfs4_xdr_dec_pathconf(struct rpc_rqst *req, struct xdr_stream *xdr,
struct nfs4_pathconf_res *res) struct nfs4_pathconf_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_sequence(&xdr, &res->seq_res, req); status = decode_sequence(xdr, &res->seq_res, req);
if (!status) if (!status)
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (!status) if (!status)
status = decode_pathconf(&xdr, res->pathconf); status = decode_pathconf(xdr, res->pathconf);
return status; return status;
} }
/* /*
* Decode STATFS response * Decode STATFS response
*/ */
static int nfs4_xdr_dec_statfs(struct rpc_rqst *req, __be32 *p, static int nfs4_xdr_dec_statfs(struct rpc_rqst *req, struct xdr_stream *xdr,
struct nfs4_statfs_res *res) struct nfs4_statfs_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_sequence(&xdr, &res->seq_res, req); status = decode_sequence(xdr, &res->seq_res, req);
if (!status) if (!status)
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (!status) if (!status)
status = decode_statfs(&xdr, res->fsstat); status = decode_statfs(xdr, res->fsstat);
return status; return status;
} }
/* /*
* Decode GETATTR_BITMAP response * Decode GETATTR_BITMAP response
*/ */
static int nfs4_xdr_dec_server_caps(struct rpc_rqst *req, __be32 *p, struct nfs4_server_caps_res *res) static int nfs4_xdr_dec_server_caps(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs4_server_caps_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, req); status = decode_sequence(xdr, &res->seq_res, req);
if (status) if (status)
goto out; goto out;
if ((status = decode_putfh(&xdr)) != 0) status = decode_putfh(xdr);
if (status)
goto out; goto out;
status = decode_server_caps(&xdr, res); status = decode_server_caps(xdr, res);
out: out:
return status; return status;
} }
...@@ -5814,79 +5810,77 @@ static int nfs4_xdr_dec_server_caps(struct rpc_rqst *req, __be32 *p, struct nfs4 ...@@ -5814,79 +5810,77 @@ static int nfs4_xdr_dec_server_caps(struct rpc_rqst *req, __be32 *p, struct nfs4
/* /*
* Decode RENEW response * Decode RENEW response
*/ */
static int nfs4_xdr_dec_renew(struct rpc_rqst *rqstp, __be32 *p, void *dummy) static int nfs4_xdr_dec_renew(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
void *__unused)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_renew(&xdr); status = decode_renew(xdr);
return status; return status;
} }
/* /*
* Decode SETCLIENTID response * Decode SETCLIENTID response
*/ */
static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, __be32 *p, static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req,
struct nfs4_setclientid_res *res) struct xdr_stream *xdr,
struct nfs4_setclientid_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_setclientid(&xdr, res); status = decode_setclientid(xdr, res);
return status; return status;
} }
/* /*
* Decode SETCLIENTID_CONFIRM response * Decode SETCLIENTID_CONFIRM response
*/ */
static int nfs4_xdr_dec_setclientid_confirm(struct rpc_rqst *req, __be32 *p, struct nfs_fsinfo *fsinfo) static int nfs4_xdr_dec_setclientid_confirm(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs_fsinfo *fsinfo)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_setclientid_confirm(&xdr); status = decode_setclientid_confirm(xdr);
if (!status) if (!status)
status = decode_putrootfh(&xdr); status = decode_putrootfh(xdr);
if (!status) if (!status)
status = decode_fsinfo(&xdr, fsinfo); status = decode_fsinfo(xdr, fsinfo);
return status; return status;
} }
/* /*
* Decode DELEGRETURN response * Decode DELEGRETURN response
*/ */
static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_delegreturnres *res) static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs4_delegreturnres *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status != 0) if (status != 0)
goto out; goto out;
status = decode_delegreturn(&xdr); status = decode_delegreturn(xdr);
if (status != 0) if (status != 0)
goto out; goto out;
decode_getfattr(&xdr, res->fattr, res->server, decode_getfattr(xdr, res->fattr, res->server,
!RPC_IS_ASYNC(rqstp->rq_task)); !RPC_IS_ASYNC(rqstp->rq_task));
out: out:
return status; return status;
...@@ -5895,26 +5889,27 @@ static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp, __be32 *p, struct nf ...@@ -5895,26 +5889,27 @@ static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp, __be32 *p, struct nf
/* /*
* Decode FS_LOCATIONS response * Decode FS_LOCATIONS response
*/ */
static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req, __be32 *p, static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nfs4_fs_locations_res *res) struct nfs4_fs_locations_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, req); status = decode_sequence(xdr, &res->seq_res, req);
if (status) if (status)
goto out; goto out;
if ((status = decode_putfh(&xdr)) != 0) status = decode_putfh(xdr);
if (status)
goto out; goto out;
if ((status = decode_lookup(&xdr)) != 0) status = decode_lookup(xdr);
if (status)
goto out; goto out;
xdr_enter_page(&xdr, PAGE_SIZE); xdr_enter_page(xdr, PAGE_SIZE);
status = decode_getfattr(&xdr, &res->fs_locations->fattr, status = decode_getfattr(xdr, &res->fs_locations->fattr,
res->fs_locations->server, res->fs_locations->server,
!RPC_IS_ASYNC(req->rq_task)); !RPC_IS_ASYNC(req->rq_task));
out: out:
...@@ -5925,129 +5920,122 @@ static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req, __be32 *p, ...@@ -5925,129 +5920,122 @@ static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req, __be32 *p,
/* /*
* Decode EXCHANGE_ID response * Decode EXCHANGE_ID response
*/ */
static int nfs4_xdr_dec_exchange_id(struct rpc_rqst *rqstp, uint32_t *p, static int nfs4_xdr_dec_exchange_id(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
void *res) void *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_exchange_id(&xdr, res); status = decode_exchange_id(xdr, res);
return status; return status;
} }
/* /*
* Decode CREATE_SESSION response * Decode CREATE_SESSION response
*/ */
static int nfs4_xdr_dec_create_session(struct rpc_rqst *rqstp, uint32_t *p, static int nfs4_xdr_dec_create_session(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs41_create_session_res *res) struct nfs41_create_session_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_create_session(&xdr, res); status = decode_create_session(xdr, res);
return status; return status;
} }
/* /*
* Decode DESTROY_SESSION response * Decode DESTROY_SESSION response
*/ */
static int nfs4_xdr_dec_destroy_session(struct rpc_rqst *rqstp, uint32_t *p, static int nfs4_xdr_dec_destroy_session(struct rpc_rqst *rqstp,
void *dummy) struct xdr_stream *xdr,
void *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_destroy_session(&xdr, dummy); status = decode_destroy_session(xdr, res);
return status; return status;
} }
/* /*
* Decode SEQUENCE response * Decode SEQUENCE response
*/ */
static int nfs4_xdr_dec_sequence(struct rpc_rqst *rqstp, uint32_t *p, static int nfs4_xdr_dec_sequence(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs4_sequence_res *res) struct nfs4_sequence_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_sequence(&xdr, res, rqstp); status = decode_sequence(xdr, res, rqstp);
return status; return status;
} }
/* /*
* Decode GET_LEASE_TIME response * Decode GET_LEASE_TIME response
*/ */
static int nfs4_xdr_dec_get_lease_time(struct rpc_rqst *rqstp, uint32_t *p, static int nfs4_xdr_dec_get_lease_time(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs4_get_lease_time_res *res) struct nfs4_get_lease_time_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_sequence(&xdr, &res->lr_seq_res, rqstp); status = decode_sequence(xdr, &res->lr_seq_res, rqstp);
if (!status) if (!status)
status = decode_putrootfh(&xdr); status = decode_putrootfh(xdr);
if (!status) if (!status)
status = decode_fsinfo(&xdr, res->lr_fsinfo); status = decode_fsinfo(xdr, res->lr_fsinfo);
return status; return status;
} }
/* /*
* Decode RECLAIM_COMPLETE response * Decode RECLAIM_COMPLETE response
*/ */
static int nfs4_xdr_dec_reclaim_complete(struct rpc_rqst *rqstp, uint32_t *p, static int nfs4_xdr_dec_reclaim_complete(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs41_reclaim_complete_res *res) struct nfs41_reclaim_complete_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (!status) if (!status)
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (!status) if (!status)
status = decode_reclaim_complete(&xdr, (void *)NULL); status = decode_reclaim_complete(xdr, (void *)NULL);
return status; return status;
} }
/* /*
* Decode GETDEVINFO response * Decode GETDEVINFO response
*/ */
static int nfs4_xdr_dec_getdeviceinfo(struct rpc_rqst *rqstp, uint32_t *p, static int nfs4_xdr_dec_getdeviceinfo(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs4_getdeviceinfo_res *res) struct nfs4_getdeviceinfo_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status != 0) if (status != 0)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status != 0) if (status != 0)
goto out; goto out;
status = decode_getdeviceinfo(&xdr, res->pdev); status = decode_getdeviceinfo(xdr, res->pdev);
out: out:
return status; return status;
} }
...@@ -6055,24 +6043,23 @@ static int nfs4_xdr_dec_getdeviceinfo(struct rpc_rqst *rqstp, uint32_t *p, ...@@ -6055,24 +6043,23 @@ static int nfs4_xdr_dec_getdeviceinfo(struct rpc_rqst *rqstp, uint32_t *p,
/* /*
* Decode LAYOUTGET response * Decode LAYOUTGET response
*/ */
static int nfs4_xdr_dec_layoutget(struct rpc_rqst *rqstp, uint32_t *p, static int nfs4_xdr_dec_layoutget(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfs4_layoutget_res *res) struct nfs4_layoutget_res *res)
{ {
struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_compound_hdr(xdr, &hdr);
status = decode_compound_hdr(&xdr, &hdr);
if (status) if (status)
goto out; goto out;
status = decode_sequence(&xdr, &res->seq_res, rqstp); status = decode_sequence(xdr, &res->seq_res, rqstp);
if (status) if (status)
goto out; goto out;
status = decode_putfh(&xdr); status = decode_putfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_layoutget(&xdr, rqstp, res); status = decode_layoutget(xdr, rqstp, res);
out: out:
return status; return status;
} }
...@@ -6236,7 +6223,7 @@ nfs4_stat_to_errno(int stat) ...@@ -6236,7 +6223,7 @@ nfs4_stat_to_errno(int stat)
[NFSPROC4_CLNT_##proc] = { \ [NFSPROC4_CLNT_##proc] = { \
.p_proc = NFSPROC4_COMPOUND, \ .p_proc = NFSPROC4_COMPOUND, \
.p_encode = (kxdreproc_t)nfs4_xdr_##argtype, \ .p_encode = (kxdreproc_t)nfs4_xdr_##argtype, \
.p_decode = (kxdrproc_t)nfs4_xdr_##restype, \ .p_decode = (kxdrdproc_t)nfs4_xdr_##restype, \
.p_arglen = NFS4_##argtype##_sz, \ .p_arglen = NFS4_##argtype##_sz, \
.p_replen = NFS4_##restype##_sz, \ .p_replen = NFS4_##restype##_sz, \
.p_statidx = NFSPROC4_CLNT_##proc, \ .p_statidx = NFSPROC4_CLNT_##proc, \
......
fs/nfsd/nfs4callback.c
View file @ bf269551
...@@ -533,7 +533,8 @@ static void nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, struct xdr_stream *xdr, ...@@ -533,7 +533,8 @@ static void nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, struct xdr_stream *xdr,
* Protocol". * Protocol".
*/ */
static int nfs4_xdr_dec_cb_null(struct rpc_rqst *req, __be32 *p, void *__unused) static int nfs4_xdr_dec_cb_null(struct rpc_rqst *req, struct xdr_stream *xdr,
void *__unused)
{ {
return 0; return 0;
} }
...@@ -541,26 +542,25 @@ static int nfs4_xdr_dec_cb_null(struct rpc_rqst *req, __be32 *p, void *__unused) ...@@ -541,26 +542,25 @@ static int nfs4_xdr_dec_cb_null(struct rpc_rqst *req, __be32 *p, void *__unused)
/* /*
* 20.2. Operation 4: CB_RECALL - Recall a Delegation * 20.2. Operation 4: CB_RECALL - Recall a Delegation
*/ */
static int nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, __be32 *p, static int nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp,
struct xdr_stream *xdr,
struct nfsd4_callback *cb) struct nfsd4_callback *cb)
{ {
struct xdr_stream xdr;
struct nfs4_cb_compound_hdr hdr; struct nfs4_cb_compound_hdr hdr;
enum nfsstat4 nfserr; enum nfsstat4 nfserr;
int status; int status;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p); status = decode_cb_compound4res(xdr, &hdr);
status = decode_cb_compound4res(&xdr, &hdr);
if (unlikely(status)) if (unlikely(status))
goto out; goto out;
if (cb != NULL) { if (cb != NULL) {
status = decode_cb_sequence4res(&xdr, cb); status = decode_cb_sequence4res(xdr, cb);
if (unlikely(status)) if (unlikely(status))
goto out; goto out;
} }
status = decode_cb_op_status(&xdr, OP_CB_RECALL, &nfserr); status = decode_cb_op_status(xdr, OP_CB_RECALL, &nfserr);
if (unlikely(status)) if (unlikely(status))
goto out; goto out;
if (unlikely(nfserr != NFS4_OK)) if (unlikely(nfserr != NFS4_OK))
...@@ -578,7 +578,7 @@ static int nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, __be32 *p, ...@@ -578,7 +578,7 @@ static int nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, __be32 *p,
[NFSPROC4_CLNT_##proc] = { \ [NFSPROC4_CLNT_##proc] = { \
.p_proc = NFSPROC4_CB_##call, \ .p_proc = NFSPROC4_CB_##call, \
.p_encode = (kxdreproc_t)nfs4_xdr_enc_##argtype, \ .p_encode = (kxdreproc_t)nfs4_xdr_enc_##argtype, \
.p_decode = (kxdrproc_t)nfs4_xdr_dec_##restype, \ .p_decode = (kxdrdproc_t)nfs4_xdr_dec_##restype, \
.p_arglen = NFS4_enc_##argtype##_sz, \ .p_arglen = NFS4_enc_##argtype##_sz, \
.p_replen = NFS4_dec_##restype##_sz, \ .p_replen = NFS4_dec_##restype##_sz, \
.p_statidx = NFSPROC4_CB_##call, \ .p_statidx = NFSPROC4_CB_##call, \
......
include/linux/sunrpc/auth.h
View file @ bf269551
...@@ -112,7 +112,7 @@ struct rpc_credops { ...@@ -112,7 +112,7 @@ struct rpc_credops {
__be32 * (*crvalidate)(struct rpc_task *, __be32 *); __be32 * (*crvalidate)(struct rpc_task *, __be32 *);
int (*crwrap_req)(struct rpc_task *, kxdreproc_t, int (*crwrap_req)(struct rpc_task *, kxdreproc_t,
void *, __be32 *, void *); void *, __be32 *, void *);
int (*crunwrap_resp)(struct rpc_task *, kxdrproc_t, int (*crunwrap_resp)(struct rpc_task *, kxdrdproc_t,
void *, __be32 *, void *); void *, __be32 *, void *);
}; };
...@@ -140,7 +140,7 @@ void put_rpccred(struct rpc_cred *); ...@@ -140,7 +140,7 @@ void put_rpccred(struct rpc_cred *);
__be32 * rpcauth_marshcred(struct rpc_task *, __be32 *); __be32 * rpcauth_marshcred(struct rpc_task *, __be32 *);
__be32 * rpcauth_checkverf(struct rpc_task *, __be32 *); __be32 * rpcauth_checkverf(struct rpc_task *, __be32 *);
int rpcauth_wrap_req(struct rpc_task *task, kxdreproc_t encode, void *rqstp, __be32 *data, void *obj); int rpcauth_wrap_req(struct rpc_task *task, kxdreproc_t encode, void *rqstp, __be32 *data, void *obj);
int rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp, __be32 *data, void *obj); int rpcauth_unwrap_resp(struct rpc_task *task, kxdrdproc_t decode, void *rqstp, __be32 *data, void *obj);
int rpcauth_refreshcred(struct rpc_task *); int rpcauth_refreshcred(struct rpc_task *);
void rpcauth_invalcred(struct rpc_task *); void rpcauth_invalcred(struct rpc_task *);
int rpcauth_uptodatecred(struct rpc_task *); int rpcauth_uptodatecred(struct rpc_task *);
......
include/linux/sunrpc/clnt.h
View file @ bf269551
...@@ -90,7 +90,7 @@ struct rpc_version { ...@@ -90,7 +90,7 @@ struct rpc_version {
struct rpc_procinfo { struct rpc_procinfo {
u32 p_proc; /* RPC procedure number */ u32 p_proc; /* RPC procedure number */
kxdreproc_t p_encode; /* XDR encode function */ kxdreproc_t p_encode; /* XDR encode function */
kxdrproc_t p_decode; /* XDR decode function */ kxdrdproc_t p_decode; /* XDR decode function */
unsigned int p_arglen; /* argument hdr length (u32) */ unsigned int p_arglen; /* argument hdr length (u32) */
unsigned int p_replen; /* reply hdr length (u32) */ unsigned int p_replen; /* reply hdr length (u32) */
unsigned int p_count; /* call count */ unsigned int p_count; /* call count */
......
include/linux/sunrpc/xdr.h
View file @ bf269551
...@@ -204,9 +204,10 @@ struct xdr_stream { ...@@ -204,9 +204,10 @@ struct xdr_stream {
}; };
/* /*
* This is the xdr_stream style generic XDR function. * These are the xdr_stream style generic XDR encode and decode functions.
*/ */
typedef void (*kxdreproc_t)(void *rqstp, struct xdr_stream *xdr, void *obj); typedef void (*kxdreproc_t)(void *rqstp, struct xdr_stream *xdr, void *obj);
typedef int (*kxdrdproc_t)(void *rqstp, struct xdr_stream *xdr, void *obj);
extern void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p); extern void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p);
extern __be32 *xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes); extern __be32 *xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes);
......
net/sunrpc/auth.c
View file @ bf269551
...@@ -587,8 +587,18 @@ rpcauth_wrap_req(struct rpc_task *task, kxdreproc_t encode, void *rqstp, ...@@ -587,8 +587,18 @@ rpcauth_wrap_req(struct rpc_task *task, kxdreproc_t encode, void *rqstp,
return 0; return 0;
} }
static int
rpcauth_unwrap_req_decode(kxdrdproc_t decode, struct rpc_rqst *rqstp,
__be32 *data, void *obj)
{
struct xdr_stream xdr;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, data);
return decode(rqstp, &xdr, obj);
}
int int
rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp, rpcauth_unwrap_resp(struct rpc_task *task, kxdrdproc_t decode, void *rqstp,
__be32 *data, void *obj) __be32 *data, void *obj)
{ {
struct rpc_cred *cred = task->tk_rqstp->rq_cred; struct rpc_cred *cred = task->tk_rqstp->rq_cred;
...@@ -599,7 +609,7 @@ rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp, ...@@ -599,7 +609,7 @@ rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp,
return cred->cr_ops->crunwrap_resp(task, decode, rqstp, return cred->cr_ops->crunwrap_resp(task, decode, rqstp,
data, obj); data, obj);
/* By default, we decode the arguments normally. */ /* By default, we decode the arguments normally. */
return decode(rqstp, data, obj); return rpcauth_unwrap_req_decode(decode, rqstp, data, obj);
} }
int int
......
net/sunrpc/auth_gss/auth_gss.c
View file @ bf269551
...@@ -1503,10 +1503,19 @@ gss_unwrap_resp_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, ...@@ -1503,10 +1503,19 @@ gss_unwrap_resp_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx,
return 0; return 0;
} }
static int
gss_unwrap_req_decode(kxdrdproc_t decode, struct rpc_rqst *rqstp,
__be32 *p, void *obj)
{
struct xdr_stream xdr;
xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
return decode(rqstp, &xdr, obj);
}
static int static int
gss_unwrap_resp(struct rpc_task *task, gss_unwrap_resp(struct rpc_task *task,
kxdrproc_t decode, void *rqstp, __be32 *p, void *obj) kxdrdproc_t decode, void *rqstp, __be32 *p, void *obj)
{ {
struct rpc_cred *cred = task->tk_rqstp->rq_cred; struct rpc_cred *cred = task->tk_rqstp->rq_cred;
struct gss_cred *gss_cred = container_of(cred, struct gss_cred, struct gss_cred *gss_cred = container_of(cred, struct gss_cred,
...@@ -1537,7 +1546,7 @@ gss_unwrap_resp(struct rpc_task *task, ...@@ -1537,7 +1546,7 @@ gss_unwrap_resp(struct rpc_task *task,
cred->cr_auth->au_rslack = cred->cr_auth->au_verfsize + (p - savedp) cred->cr_auth->au_rslack = cred->cr_auth->au_verfsize + (p - savedp)
+ (savedlen - head->iov_len); + (savedlen - head->iov_len);
out_decode: out_decode:
status = decode(rqstp, p, obj); status = gss_unwrap_req_decode(decode, rqstp, p, obj);
out: out:
gss_put_ctx(ctx); gss_put_ctx(ctx);
dprintk("RPC: %5u gss_unwrap_resp returning %d\n", task->tk_pid, dprintk("RPC: %5u gss_unwrap_resp returning %d\n", task->tk_pid,
......
net/sunrpc/clnt.c
View file @ bf269551
...@@ -1535,7 +1535,7 @@ call_decode(struct rpc_task *task) ...@@ -1535,7 +1535,7 @@ call_decode(struct rpc_task *task)
{ {
struct rpc_clnt *clnt = task->tk_client; struct rpc_clnt *clnt = task->tk_client;
struct rpc_rqst *req = task->tk_rqstp; struct rpc_rqst *req = task->tk_rqstp;
kxdrproc_t decode = task->tk_msg.rpc_proc->p_decode; kxdrdproc_t decode = task->tk_msg.rpc_proc->p_decode;
__be32 *p; __be32 *p;
dprintk("RPC: %5u call_decode (status %d)\n", dprintk("RPC: %5u call_decode (status %d)\n",
...@@ -1780,7 +1780,7 @@ static void rpcproc_encode_null(void *rqstp, struct xdr_stream *xdr, void *obj) ...@@ -1780,7 +1780,7 @@ static void rpcproc_encode_null(void *rqstp, struct xdr_stream *xdr, void *obj)
{ {
} }
static int rpcproc_decode_null(void *rqstp, __be32 *data, void *obj) static int rpcproc_decode_null(void *rqstp, struct xdr_stream *xdr, void *obj)
{ {
return 0; return 0;
} }
......
net/sunrpc/rpcb_clnt.c
View file @ bf269551
...@@ -706,18 +706,16 @@ static void rpcb_enc_mapping(struct rpc_rqst *req, struct xdr_stream *xdr, ...@@ -706,18 +706,16 @@ static void rpcb_enc_mapping(struct rpc_rqst *req, struct xdr_stream *xdr,
*p = cpu_to_be32(rpcb->r_port); *p = cpu_to_be32(rpcb->r_port);
} }
static int rpcb_dec_getport(struct rpc_rqst *req, __be32 *p, static int rpcb_dec_getport(struct rpc_rqst *req, struct xdr_stream *xdr,
struct rpcbind_args *rpcb) struct rpcbind_args *rpcb)
{ {
struct rpc_task *task = req->rq_task; struct rpc_task *task = req->rq_task;
struct xdr_stream xdr;
unsigned long port; unsigned long port;
__be32 *p;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
rpcb->r_port = 0; rpcb->r_port = 0;
p = xdr_inline_decode(&xdr, 4); p = xdr_inline_decode(xdr, 4);
if (unlikely(p == NULL)) if (unlikely(p == NULL))
return -EIO; return -EIO;
...@@ -731,20 +729,18 @@ static int rpcb_dec_getport(struct rpc_rqst *req, __be32 *p, ...@@ -731,20 +729,18 @@ static int rpcb_dec_getport(struct rpc_rqst *req, __be32 *p,
return 0; return 0;
} }
static int rpcb_dec_set(struct rpc_rqst *req, __be32 *p, static int rpcb_dec_set(struct rpc_rqst *req, struct xdr_stream *xdr,
unsigned int *boolp) unsigned int *boolp)
{ {
struct rpc_task *task = req->rq_task; struct rpc_task *task = req->rq_task;
struct xdr_stream xdr; __be32 *p;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
p = xdr_inline_decode(&xdr, 4); p = xdr_inline_decode(xdr, 4);
if (unlikely(p == NULL)) if (unlikely(p == NULL))
return -EIO; return -EIO;
*boolp = 0; *boolp = 0;
if (*p) if (*p != xdr_zero)
*boolp = 1; *boolp = 1;
dprintk("RPC: %5u RPCB_%s call %s\n", dprintk("RPC: %5u RPCB_%s call %s\n",
...@@ -785,20 +781,18 @@ static void rpcb_enc_getaddr(struct rpc_rqst *req, struct xdr_stream *xdr, ...@@ -785,20 +781,18 @@ static void rpcb_enc_getaddr(struct rpc_rqst *req, struct xdr_stream *xdr,
encode_rpcb_string(xdr, rpcb->r_owner, RPCB_MAXOWNERLEN); encode_rpcb_string(xdr, rpcb->r_owner, RPCB_MAXOWNERLEN);
} }
static int rpcb_dec_getaddr(struct rpc_rqst *req, __be32 *p, static int rpcb_dec_getaddr(struct rpc_rqst *req, struct xdr_stream *xdr,
struct rpcbind_args *rpcb) struct rpcbind_args *rpcb)
{ {
struct sockaddr_storage address; struct sockaddr_storage address;
struct sockaddr *sap = (struct sockaddr *)&address; struct sockaddr *sap = (struct sockaddr *)&address;
struct rpc_task *task = req->rq_task; struct rpc_task *task = req->rq_task;
struct xdr_stream xdr; __be32 *p;
u32 len; u32 len;
rpcb->r_port = 0; rpcb->r_port = 0;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p); p = xdr_inline_decode(xdr, 4);
p = xdr_inline_decode(&xdr, 4);
if (unlikely(p == NULL)) if (unlikely(p == NULL))
goto out_fail; goto out_fail;
len = be32_to_cpup(p); len = be32_to_cpup(p);
...@@ -816,7 +810,7 @@ static int rpcb_dec_getaddr(struct rpc_rqst *req, __be32 *p, ...@@ -816,7 +810,7 @@ static int rpcb_dec_getaddr(struct rpc_rqst *req, __be32 *p,
if (unlikely(len > RPCBIND_MAXUADDRLEN)) if (unlikely(len > RPCBIND_MAXUADDRLEN))
goto out_fail; goto out_fail;
p = xdr_inline_decode(&xdr, len); p = xdr_inline_decode(xdr, len);
if (unlikely(p == NULL)) if (unlikely(p == NULL))
goto out_fail; goto out_fail;
dprintk("RPC: %5u RPCB_%s reply: %s\n", task->tk_pid, dprintk("RPC: %5u RPCB_%s reply: %s\n", task->tk_pid,
...@@ -843,7 +837,7 @@ static struct rpc_procinfo rpcb_procedures2[] = { ...@@ -843,7 +837,7 @@ static struct rpc_procinfo rpcb_procedures2[] = {
[RPCBPROC_SET] = { [RPCBPROC_SET] = {
.p_proc = RPCBPROC_SET, .p_proc = RPCBPROC_SET,
.p_encode = (kxdreproc_t)rpcb_enc_mapping, .p_encode = (kxdreproc_t)rpcb_enc_mapping,
.p_decode = (kxdrproc_t)rpcb_dec_set, .p_decode = (kxdrdproc_t)rpcb_dec_set,
.p_arglen = RPCB_mappingargs_sz, .p_arglen = RPCB_mappingargs_sz,
.p_replen = RPCB_setres_sz, .p_replen = RPCB_setres_sz,
.p_statidx = RPCBPROC_SET, .p_statidx = RPCBPROC_SET,
...@@ -853,7 +847,7 @@ static struct rpc_procinfo rpcb_procedures2[] = { ...@@ -853,7 +847,7 @@ static struct rpc_procinfo rpcb_procedures2[] = {
[RPCBPROC_UNSET] = { [RPCBPROC_UNSET] = {
.p_proc = RPCBPROC_UNSET, .p_proc = RPCBPROC_UNSET,
.p_encode = (kxdreproc_t)rpcb_enc_mapping, .p_encode = (kxdreproc_t)rpcb_enc_mapping,
.p_decode = (kxdrproc_t)rpcb_dec_set, .p_decode = (kxdrdproc_t)rpcb_dec_set,
.p_arglen = RPCB_mappingargs_sz, .p_arglen = RPCB_mappingargs_sz,
.p_replen = RPCB_setres_sz, .p_replen = RPCB_setres_sz,
.p_statidx = RPCBPROC_UNSET, .p_statidx = RPCBPROC_UNSET,
...@@ -863,7 +857,7 @@ static struct rpc_procinfo rpcb_procedures2[] = { ...@@ -863,7 +857,7 @@ static struct rpc_procinfo rpcb_procedures2[] = {
[RPCBPROC_GETPORT] = { [RPCBPROC_GETPORT] = {
.p_proc = RPCBPROC_GETPORT, .p_proc = RPCBPROC_GETPORT,
.p_encode = (kxdreproc_t)rpcb_enc_mapping, .p_encode = (kxdreproc_t)rpcb_enc_mapping,
.p_decode = (kxdrproc_t)rpcb_dec_getport, .p_decode = (kxdrdproc_t)rpcb_dec_getport,
.p_arglen = RPCB_mappingargs_sz, .p_arglen = RPCB_mappingargs_sz,
.p_replen = RPCB_getportres_sz, .p_replen = RPCB_getportres_sz,
.p_statidx = RPCBPROC_GETPORT, .p_statidx = RPCBPROC_GETPORT,
...@@ -876,7 +870,7 @@ static struct rpc_procinfo rpcb_procedures3[] = { ...@@ -876,7 +870,7 @@ static struct rpc_procinfo rpcb_procedures3[] = {
[RPCBPROC_SET] = { [RPCBPROC_SET] = {
.p_proc = RPCBPROC_SET, .p_proc = RPCBPROC_SET,
.p_encode = (kxdreproc_t)rpcb_enc_getaddr, .p_encode = (kxdreproc_t)rpcb_enc_getaddr,
.p_decode = (kxdrproc_t)rpcb_dec_set, .p_decode = (kxdrdproc_t)rpcb_dec_set,
.p_arglen = RPCB_getaddrargs_sz, .p_arglen = RPCB_getaddrargs_sz,
.p_replen = RPCB_setres_sz, .p_replen = RPCB_setres_sz,
.p_statidx = RPCBPROC_SET, .p_statidx = RPCBPROC_SET,
...@@ -886,7 +880,7 @@ static struct rpc_procinfo rpcb_procedures3[] = { ...@@ -886,7 +880,7 @@ static struct rpc_procinfo rpcb_procedures3[] = {
[RPCBPROC_UNSET] = { [RPCBPROC_UNSET] = {
.p_proc = RPCBPROC_UNSET, .p_proc = RPCBPROC_UNSET,
.p_encode = (kxdreproc_t)rpcb_enc_getaddr, .p_encode = (kxdreproc_t)rpcb_enc_getaddr,
.p_decode = (kxdrproc_t)rpcb_dec_set, .p_decode = (kxdrdproc_t)rpcb_dec_set,
.p_arglen = RPCB_getaddrargs_sz, .p_arglen = RPCB_getaddrargs_sz,
.p_replen = RPCB_setres_sz, .p_replen = RPCB_setres_sz,
.p_statidx = RPCBPROC_UNSET, .p_statidx = RPCBPROC_UNSET,
...@@ -896,7 +890,7 @@ static struct rpc_procinfo rpcb_procedures3[] = { ...@@ -896,7 +890,7 @@ static struct rpc_procinfo rpcb_procedures3[] = {
[RPCBPROC_GETADDR] = { [RPCBPROC_GETADDR] = {
.p_proc = RPCBPROC_GETADDR, .p_proc = RPCBPROC_GETADDR,
.p_encode = (kxdreproc_t)rpcb_enc_getaddr, .p_encode = (kxdreproc_t)rpcb_enc_getaddr,
.p_decode = (kxdrproc_t)rpcb_dec_getaddr, .p_decode = (kxdrdproc_t)rpcb_dec_getaddr,
.p_arglen = RPCB_getaddrargs_sz, .p_arglen = RPCB_getaddrargs_sz,
.p_replen = RPCB_getaddrres_sz, .p_replen = RPCB_getaddrres_sz,
.p_statidx = RPCBPROC_GETADDR, .p_statidx = RPCBPROC_GETADDR,
...@@ -909,7 +903,7 @@ static struct rpc_procinfo rpcb_procedures4[] = { ...@@ -909,7 +903,7 @@ static struct rpc_procinfo rpcb_procedures4[] = {
[RPCBPROC_SET] = { [RPCBPROC_SET] = {
.p_proc = RPCBPROC_SET, .p_proc = RPCBPROC_SET,
.p_encode = (kxdreproc_t)rpcb_enc_getaddr, .p_encode = (kxdreproc_t)rpcb_enc_getaddr,
.p_decode = (kxdrproc_t)rpcb_dec_set, .p_decode = (kxdrdproc_t)rpcb_dec_set,
.p_arglen = RPCB_getaddrargs_sz, .p_arglen = RPCB_getaddrargs_sz,
.p_replen = RPCB_setres_sz, .p_replen = RPCB_setres_sz,
.p_statidx = RPCBPROC_SET, .p_statidx = RPCBPROC_SET,
...@@ -919,7 +913,7 @@ static struct rpc_procinfo rpcb_procedures4[] = { ...@@ -919,7 +913,7 @@ static struct rpc_procinfo rpcb_procedures4[] = {
[RPCBPROC_UNSET] = { [RPCBPROC_UNSET] = {
.p_proc = RPCBPROC_UNSET, .p_proc = RPCBPROC_UNSET,
.p_encode = (kxdreproc_t)rpcb_enc_getaddr, .p_encode = (kxdreproc_t)rpcb_enc_getaddr,
.p_decode = (kxdrproc_t)rpcb_dec_set, .p_decode = (kxdrdproc_t)rpcb_dec_set,
.p_arglen = RPCB_getaddrargs_sz, .p_arglen = RPCB_getaddrargs_sz,
.p_replen = RPCB_setres_sz, .p_replen = RPCB_setres_sz,
.p_statidx = RPCBPROC_UNSET, .p_statidx = RPCBPROC_UNSET,
...@@ -929,7 +923,7 @@ static struct rpc_procinfo rpcb_procedures4[] = { ...@@ -929,7 +923,7 @@ static struct rpc_procinfo rpcb_procedures4[] = {
[RPCBPROC_GETADDR] = { [RPCBPROC_GETADDR] = {
.p_proc = RPCBPROC_GETADDR, .p_proc = RPCBPROC_GETADDR,
.p_encode = (kxdreproc_t)rpcb_enc_getaddr, .p_encode = (kxdreproc_t)rpcb_enc_getaddr,
.p_decode = (kxdrproc_t)rpcb_dec_getaddr, .p_decode = (kxdrdproc_t)rpcb_dec_getaddr,
.p_arglen = RPCB_getaddrargs_sz, .p_arglen = RPCB_getaddrargs_sz,
.p_replen = RPCB_getaddrres_sz, .p_replen = RPCB_getaddrres_sz,
.p_statidx = RPCBPROC_GETADDR, .p_statidx = RPCBPROC_GETADDR,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7