android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SUNRPC: Remove open coded stream position calculation in xdr_read_pages

Browse Source 
Use xdr_stream_pos() instead.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-06-26 12:19:55 -04:00
parent 1aecca3e83
commit b760b3131d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/sunrpc/xdr.c
View File

@ -764,6 +764,7 @@ unsigned int xdr_read_pages(struct xdr_stream *xdr, unsigned int len)
struct kvec *iov; struct kvec *iov;
ssize_t shift; ssize_t shift;
unsigned int nwords = XDR_QUADLEN(len); unsigned int nwords = XDR_QUADLEN(len);
unsigned int cur = xdr_stream_pos(xdr);
unsigned int end; unsigned int end;
int padding; int padding;
@ -775,9 +776,8 @@ unsigned int xdr_read_pages(struct xdr_stream *xdr, unsigned int len)
} }
/* Realign pages to current pointer position */ /* Realign pages to current pointer position */
iov = buf->head; iov = buf->head;
shift = iov->iov_len + (char *)iov->iov_base - (char *)xdr->p; if (iov->iov_len > cur)
if (shift > 0) xdr_shrink_bufhead(buf, iov->iov_len - cur);
xdr_shrink_bufhead(buf, shift);
/* Truncate page data and move it into the tail */ /* Truncate page data and move it into the tail */
if (buf->page_len > len) if (buf->page_len > len)