From: Benny Halevy <bhalevy@panasas.com>
Date: Sun, 29 Aug 2010 16:13:15 +0000 (-0400)
Subject: sunrpc: clean up xdr_shrink_pagelen use of temporary pointer
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0fe62a35903e11fb41b492bd5b0e8e4c751d5c94;p=deliverable%2Flinux.git

sunrpc: clean up xdr_shrink_pagelen use of temporary pointer

char *p is used only as a shorthand for tail->iov_base + len in a nested
block.  Move it there.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 91f0de944d0f..41be21f7f7b9 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -395,7 +395,6 @@ xdr_shrink_pagelen(struct xdr_buf *buf, size_t len)
 {
 	struct kvec *tail;
 	size_t copy;
-	char *p;
 	unsigned int pglen = buf->page_len;
 
 	tail = buf->tail;
@@ -403,8 +402,8 @@ xdr_shrink_pagelen(struct xdr_buf *buf, size_t len)
 
 	/* Shift the tail first */
 	if (tail->iov_len != 0) {
-		p = (char *)tail->iov_base + len;
 		if (tail->iov_len > len) {
+			char *p = (char *)tail->iov_base + len;
 			copy = tail->iov_len - len;
 			memmove(p, tail->iov_base, copy);
 		}