2 files changed, 6 insertions, 5 deletions

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index ca8a7958f4e6..349c98f9818b 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -189,7 +189,7 @@ svc_pool_map_init_percpu(struct svc_pool_map *m)
                 return err;
 
         for_each_online_cpu(cpu) {
-                BUG_ON(pidx > maxpools);
+                BUG_ON(pidx >= maxpools);
                 m->to_pool[cpu] = pidx;
                 m->pool_to[pidx] = cpu;
                 pidx++;
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 290af97bf6f9..1cb61242e55e 100644
--- 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) {