git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[safe/jmp/linux-2.6]
/
net
/
sunrpc
/
socklib.c
diff --git
a/net/sunrpc/socklib.c
b/net/sunrpc/socklib.c
index
1d377d1
..
a661a3a
100644
(file)
--- a/
net/sunrpc/socklib.c
+++ b/
net/sunrpc/socklib.c
@@
-34,6
+34,7
@@
size_t xdr_skb_read_bits(struct xdr_skb_reader *desc, void *to, size_t len)
desc->offset += len;
return len;
}
desc->offset += len;
return len;
}
+EXPORT_SYMBOL_GPL(xdr_skb_read_bits);
/**
* xdr_skb_read_and_csum_bits - copy and checksum from skb to buffer
/**
* xdr_skb_read_and_csum_bits - copy and checksum from skb to buffer
@@
-71,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;
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) {
len = xdr->head[0].iov_len;
if (base < len) {
@@
-137,6
+138,7
@@
copy_tail:
out:
return copied;
}
out:
return copied;
}
+EXPORT_SYMBOL_GPL(xdr_partial_copy_from_skb);
/**
* csum_partial_copy_to_xdr - checksum and copy data
/**
* csum_partial_copy_to_xdr - checksum and copy data
@@
-179,3
+181,4
@@
no_checksum:
return -1;
return 0;
}
return -1;
return 0;
}
+EXPORT_SYMBOL_GPL(csum_partial_copy_to_xdr);