1 files changed, 3 insertions, 4 deletions

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 2bbb8d38d2bf..f302c6eb8779 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -546,7 +546,7 @@ EXPORT_SYMBOL_GPL(xdr_commit_encode);
 static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
                 size_t nbytes)
 {
-        static __be32 *p;
+        __be32 *p;
         int space_left;
         int frag1bytes, frag2bytes;
 
@@ -673,11 +673,10 @@ void xdr_truncate_encode(struct xdr_stream *xdr, size_t len)
                 WARN_ON_ONCE(xdr->iov);
                 return;
         }
-        if (fraglen) {
+        if (fraglen)
                 xdr->end = head->iov_base + head->iov_len;
-                xdr->page_ptr--;
-        }
         /* (otherwise assume xdr->end is already set) */
+        xdr->page_ptr--;
         head->iov_len = len;
         buf->len = len;
         xdr->p = head->iov_base + head->iov_len;