diff --git a/[refs] b/[refs] index 8cadaecbf4ec..ac4c7fae5243 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d40a8a525c8165bafed233cf0f137e8d10d7e92 +refs/heads/master: 322e2efe6224be5de2852a7fddfac5cf11317af3 diff --git a/trunk/net/sunrpc/socklib.c b/trunk/net/sunrpc/socklib.c index 97ac45f034d6..a661a3acb37e 100644 --- a/trunk/net/sunrpc/socklib.c +++ b/trunk/net/sunrpc/socklib.c @@ -72,7 +72,7 @@ ssize_t xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base, struct struct page **ppage = xdr->pages; unsigned int len, pglen = xdr->page_len; ssize_t copied = 0; - int ret; + size_t ret; len = xdr->head[0].iov_len; if (base < len) {