From 383665b321f47a163695c785306d1d78b66c076b Mon Sep 17 00:00:00 2001 From: Benny Halevy Date: Sun, 29 Aug 2010 12:13:15 -0400 Subject: [PATCH] --- yaml --- r: 217025 b: refs/heads/master c: 0fe62a35903e11fb41b492bd5b0e8e4c751d5c94 h: refs/heads/master i: 217023: 72f3656263b8b9fa1fec284567768014b8bd9aad v: v3 --- [refs] | 2 +- trunk/net/sunrpc/xdr.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fb7c5f8ee238..1196d4f5a099 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1a7a91ada8388936ffff92cf1ad57b3e926f412 +refs/heads/master: 0fe62a35903e11fb41b492bd5b0e8e4c751d5c94 diff --git a/trunk/net/sunrpc/xdr.c b/trunk/net/sunrpc/xdr.c index 91f0de944d0f..41be21f7f7b9 100644 --- a/trunk/net/sunrpc/xdr.c +++ b/trunk/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); }