diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 95980a5cd0a8190e4318dc1bd6adb9a323838c32..faf6753c593d0b224344a059114c2a2d2d01304b 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)