From: Trond Myklebust Date: Tue, 26 Jun 2012 16:19:55 +0000 (-0400) Subject: SUNRPC: Remove open coded stream position calculation in xdr_read_pages X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b760b3131d962dd35925fb65956afe621fa65ec4;p=linux-beck.git SUNRPC: Remove open coded stream position calculation in xdr_read_pages Use xdr_stream_pos() instead. Signed-off-by: Trond Myklebust --- diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 95980a5cd0a8..faf6753c593d 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -764,6 +764,7 @@ unsigned int xdr_read_pages(struct xdr_stream *xdr, unsigned int len) struct kvec *iov; ssize_t shift; unsigned int nwords = XDR_QUADLEN(len); + unsigned int cur = xdr_stream_pos(xdr); unsigned int end; int padding; @@ -775,9 +776,8 @@ unsigned int xdr_read_pages(struct xdr_stream *xdr, unsigned int len) } /* Realign pages to current pointer position */ iov = buf->head; - shift = iov->iov_len + (char *)iov->iov_base - (char *)xdr->p; - if (shift > 0) - xdr_shrink_bufhead(buf, shift); + if (iov->iov_len > cur) + xdr_shrink_bufhead(buf, iov->iov_len - cur); /* Truncate page data and move it into the tail */ if (buf->page_len > len)