nfsd4: more read encoding cleanup
More cleanup, no change in functionality. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
parent
34a78b488f
commit
fec25fa4ad
1 changed files with 10 additions and 12 deletions
|
@ -3077,11 +3077,9 @@ static __be32 nfsd4_encode_splice_read(
|
||||||
struct xdr_stream *xdr = &resp->xdr;
|
struct xdr_stream *xdr = &resp->xdr;
|
||||||
struct xdr_buf *buf = xdr->buf;
|
struct xdr_buf *buf = xdr->buf;
|
||||||
u32 eof;
|
u32 eof;
|
||||||
int starting_len = xdr->buf->len - 8;
|
|
||||||
int space_left;
|
int space_left;
|
||||||
__be32 nfserr;
|
__be32 nfserr;
|
||||||
__be32 tmp;
|
__be32 *p = xdr->p - 2;
|
||||||
__be32 *p;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Don't inline pages unless we know there's room for eof,
|
* Don't inline pages unless we know there's room for eof,
|
||||||
|
@ -3105,25 +3103,25 @@ static __be32 nfsd4_encode_splice_read(
|
||||||
eof = (read->rd_offset + maxcount >=
|
eof = (read->rd_offset + maxcount >=
|
||||||
read->rd_fhp->fh_dentry->d_inode->i_size);
|
read->rd_fhp->fh_dentry->d_inode->i_size);
|
||||||
|
|
||||||
tmp = htonl(eof);
|
*(p++) = htonl(eof);
|
||||||
write_bytes_to_xdr_buf(buf, starting_len , &tmp, 4);
|
*(p++) = htonl(maxcount);
|
||||||
tmp = htonl(maxcount);
|
|
||||||
write_bytes_to_xdr_buf(buf, starting_len + 4, &tmp, 4);
|
|
||||||
|
|
||||||
buf->page_len = maxcount;
|
buf->page_len = maxcount;
|
||||||
buf->len += maxcount;
|
buf->len += maxcount;
|
||||||
xdr->page_ptr += (maxcount + PAGE_SIZE - 1) / PAGE_SIZE;
|
xdr->page_ptr += (maxcount + PAGE_SIZE - 1) / PAGE_SIZE;
|
||||||
xdr->iov = buf->tail;
|
|
||||||
|
|
||||||
/* Use rest of head for padding and remaining ops: */
|
/* Use rest of head for padding and remaining ops: */
|
||||||
buf->tail[0].iov_base = xdr->p;
|
buf->tail[0].iov_base = xdr->p;
|
||||||
buf->tail[0].iov_len = 0;
|
buf->tail[0].iov_len = 0;
|
||||||
|
xdr->iov = buf->tail;
|
||||||
if (maxcount&3) {
|
if (maxcount&3) {
|
||||||
p = xdr_reserve_space(xdr, 4);
|
int pad = 4 - (maxcount&3);
|
||||||
WRITE32(0);
|
|
||||||
|
*(xdr->p++) = 0;
|
||||||
|
|
||||||
buf->tail[0].iov_base += maxcount&3;
|
buf->tail[0].iov_base += maxcount&3;
|
||||||
buf->tail[0].iov_len = 4 - (maxcount&3);
|
buf->tail[0].iov_len = pad;
|
||||||
buf->len -= (maxcount&3);
|
buf->len += pad;
|
||||||
}
|
}
|
||||||
|
|
||||||
space_left = min_t(int, (void *)xdr->end - (void *)xdr->p,
|
space_left = min_t(int, (void *)xdr->end - (void *)xdr->p,
|
||||||
|
|
Loading…
Reference in a new issue