Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / net / sunrpc / xdr.c

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 290af97..1cb6124 100644 (file)
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -617,9 +617,10 @@ void xdr_truncate_encode(struct xdr_stream *xdr, size_t len)
        fraglen = min_t(int, buf->len - len, tail->iov_len);
        tail->iov_len -= fraglen;
        buf->len -= fraglen;
-       if (tail->iov_len && buf->len == len) {
+       if (tail->iov_len) {
                xdr->p = tail->iov_base + tail->iov_len;
-               /* xdr->end, xdr->iov should be set already */
+               WARN_ON_ONCE(!xdr->end);
+               WARN_ON_ONCE(!xdr->iov);
                return;
        }
        WARN_ON_ONCE(fraglen);
@@ -631,11 +632,11 @@ void xdr_truncate_encode(struct xdr_stream *xdr, size_t len)
        old = new + fraglen;
        xdr->page_ptr -= (old >> PAGE_SHIFT) - (new >> PAGE_SHIFT);
 
-       if (buf->page_len && buf->len == len) {
+       if (buf->page_len) {
                xdr->p = page_address(*xdr->page_ptr);
                xdr->end = (void *)xdr->p + PAGE_SIZE;
                xdr->p = (void *)xdr->p + (new % PAGE_SIZE);
-               /* xdr->iov should already be NULL */
+               WARN_ON_ONCE(xdr->iov);
                return;
        }
        if (fraglen) {