aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4proc.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2014-01-15 15:17:58 -0500
committerJ. Bruce Fields <bfields@redhat.com>2014-05-23 09:03:45 -0400
commit4aea24b2ff7510932118ec9b06c35a11625194ea (patch)
treefcd3b1ff1544696ebd0381d5fbbba0ec4ccd1df4 /fs/nfsd/nfs4proc.c
parente372ba60def1af33e1c0b9bbfa5c8f8559c1ad6b (diff)
nfsd4: embed xdr_stream in nfsd4_compoundres
This is a mechanical transformation with no change in behavior. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
-rw-r--r--fs/nfsd/nfs4proc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index b0e075cd6c99..6d94adf6c963 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1270,13 +1270,13 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
1270 u32 plen = 0; 1270 u32 plen = 0;
1271 __be32 status; 1271 __be32 status;
1272 1272
1273 resp->xbuf = &rqstp->rq_res; 1273 resp->xdr.buf = &rqstp->rq_res;
1274 resp->p = rqstp->rq_res.head[0].iov_base + 1274 resp->xdr.p = rqstp->rq_res.head[0].iov_base +
1275 rqstp->rq_res.head[0].iov_len; 1275 rqstp->rq_res.head[0].iov_len;
1276 resp->tagp = resp->p; 1276 resp->tagp = resp->xdr.p;
1277 /* reserve space for: taglen, tag, and opcnt */ 1277 /* reserve space for: taglen, tag, and opcnt */
1278 resp->p += 2 + XDR_QUADLEN(args->taglen); 1278 resp->xdr.p += 2 + XDR_QUADLEN(args->taglen);
1279 resp->end = rqstp->rq_res.head[0].iov_base + PAGE_SIZE; 1279 resp->xdr.end = rqstp->rq_res.head[0].iov_base + PAGE_SIZE;
1280 resp->taglen = args->taglen; 1280 resp->taglen = args->taglen;
1281 resp->tag = args->tag; 1281 resp->tag = args->tag;
1282 resp->opcnt = 0; 1282 resp->opcnt = 0;
@@ -1328,7 +1328,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
1328 * failed response to the next operation. If we don't 1328 * failed response to the next operation. If we don't
1329 * have enough room, fail with ERR_RESOURCE. 1329 * have enough room, fail with ERR_RESOURCE.
1330 */ 1330 */
1331 slack_bytes = (char *)resp->end - (char *)resp->p; 1331 slack_bytes = (char *)resp->xdr.end - (char *)resp->xdr.p;
1332 if (slack_bytes < COMPOUND_SLACK_SPACE 1332 if (slack_bytes < COMPOUND_SLACK_SPACE
1333 + COMPOUND_ERR_SLACK_SPACE) { 1333 + COMPOUND_ERR_SLACK_SPACE) {
1334 BUG_ON(slack_bytes < COMPOUND_ERR_SLACK_SPACE); 1334 BUG_ON(slack_bytes < COMPOUND_ERR_SLACK_SPACE);