git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
net
/
sunrpc
/
socklib.c
diff --git
a/net/sunrpc/socklib.c
b/net/sunrpc/socklib.c
index
97ac45f
..
a661a3a
100644
(file)
--- a/
net/sunrpc/socklib.c
+++ b/
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) {