diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-30 16:51:43 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-30 16:51:43 -0500 |
commit | 08cc36cbd1ee7d86422713bb21551eed1326b894 (patch) | |
tree | 52cc683387f903b34a7f6f798dcdbae385b58db8 /net/sunrpc/xdr.c | |
parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
parent | 46f72f57d279688c4524df78edb5738db730eeef (diff) |
Merge branch 'devel' into next
Diffstat (limited to 'net/sunrpc/xdr.c')
-rw-r--r-- | net/sunrpc/xdr.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 79a55d56cc98..406e26de584e 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c | |||
@@ -28,7 +28,7 @@ xdr_encode_netobj(__be32 *p, const struct xdr_netobj *obj) | |||
28 | memcpy(p, obj->data, obj->len); | 28 | memcpy(p, obj->data, obj->len); |
29 | return p + XDR_QUADLEN(obj->len); | 29 | return p + XDR_QUADLEN(obj->len); |
30 | } | 30 | } |
31 | EXPORT_SYMBOL(xdr_encode_netobj); | 31 | EXPORT_SYMBOL_GPL(xdr_encode_netobj); |
32 | 32 | ||
33 | __be32 * | 33 | __be32 * |
34 | xdr_decode_netobj(__be32 *p, struct xdr_netobj *obj) | 34 | xdr_decode_netobj(__be32 *p, struct xdr_netobj *obj) |
@@ -41,7 +41,7 @@ xdr_decode_netobj(__be32 *p, struct xdr_netobj *obj) | |||
41 | obj->data = (u8 *) p; | 41 | obj->data = (u8 *) p; |
42 | return p + XDR_QUADLEN(len); | 42 | return p + XDR_QUADLEN(len); |
43 | } | 43 | } |
44 | EXPORT_SYMBOL(xdr_decode_netobj); | 44 | EXPORT_SYMBOL_GPL(xdr_decode_netobj); |
45 | 45 | ||
46 | /** | 46 | /** |
47 | * xdr_encode_opaque_fixed - Encode fixed length opaque data | 47 | * xdr_encode_opaque_fixed - Encode fixed length opaque data |
@@ -71,7 +71,7 @@ __be32 *xdr_encode_opaque_fixed(__be32 *p, const void *ptr, unsigned int nbytes) | |||
71 | } | 71 | } |
72 | return p; | 72 | return p; |
73 | } | 73 | } |
74 | EXPORT_SYMBOL(xdr_encode_opaque_fixed); | 74 | EXPORT_SYMBOL_GPL(xdr_encode_opaque_fixed); |
75 | 75 | ||
76 | /** | 76 | /** |
77 | * xdr_encode_opaque - Encode variable length opaque data | 77 | * xdr_encode_opaque - Encode variable length opaque data |
@@ -86,14 +86,14 @@ __be32 *xdr_encode_opaque(__be32 *p, const void *ptr, unsigned int nbytes) | |||
86 | *p++ = htonl(nbytes); | 86 | *p++ = htonl(nbytes); |
87 | return xdr_encode_opaque_fixed(p, ptr, nbytes); | 87 | return xdr_encode_opaque_fixed(p, ptr, nbytes); |
88 | } | 88 | } |
89 | EXPORT_SYMBOL(xdr_encode_opaque); | 89 | EXPORT_SYMBOL_GPL(xdr_encode_opaque); |
90 | 90 | ||
91 | __be32 * | 91 | __be32 * |
92 | xdr_encode_string(__be32 *p, const char *string) | 92 | xdr_encode_string(__be32 *p, const char *string) |
93 | { | 93 | { |
94 | return xdr_encode_array(p, string, strlen(string)); | 94 | return xdr_encode_array(p, string, strlen(string)); |
95 | } | 95 | } |
96 | EXPORT_SYMBOL(xdr_encode_string); | 96 | EXPORT_SYMBOL_GPL(xdr_encode_string); |
97 | 97 | ||
98 | __be32 * | 98 | __be32 * |
99 | xdr_decode_string_inplace(__be32 *p, char **sp, | 99 | xdr_decode_string_inplace(__be32 *p, char **sp, |
@@ -108,7 +108,7 @@ xdr_decode_string_inplace(__be32 *p, char **sp, | |||
108 | *sp = (char *) p; | 108 | *sp = (char *) p; |
109 | return p + XDR_QUADLEN(len); | 109 | return p + XDR_QUADLEN(len); |
110 | } | 110 | } |
111 | EXPORT_SYMBOL(xdr_decode_string_inplace); | 111 | EXPORT_SYMBOL_GPL(xdr_decode_string_inplace); |
112 | 112 | ||
113 | void | 113 | void |
114 | xdr_encode_pages(struct xdr_buf *xdr, struct page **pages, unsigned int base, | 114 | xdr_encode_pages(struct xdr_buf *xdr, struct page **pages, unsigned int base, |
@@ -136,7 +136,7 @@ xdr_encode_pages(struct xdr_buf *xdr, struct page **pages, unsigned int base, | |||
136 | xdr->buflen += len; | 136 | xdr->buflen += len; |
137 | xdr->len += len; | 137 | xdr->len += len; |
138 | } | 138 | } |
139 | EXPORT_SYMBOL(xdr_encode_pages); | 139 | EXPORT_SYMBOL_GPL(xdr_encode_pages); |
140 | 140 | ||
141 | void | 141 | void |
142 | xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset, | 142 | xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset, |
@@ -158,7 +158,7 @@ xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset, | |||
158 | 158 | ||
159 | xdr->buflen += len; | 159 | xdr->buflen += len; |
160 | } | 160 | } |
161 | EXPORT_SYMBOL(xdr_inline_pages); | 161 | EXPORT_SYMBOL_GPL(xdr_inline_pages); |
162 | 162 | ||
163 | /* | 163 | /* |
164 | * Helper routines for doing 'memmove' like operations on a struct xdr_buf | 164 | * Helper routines for doing 'memmove' like operations on a struct xdr_buf |
@@ -428,7 +428,7 @@ xdr_shift_buf(struct xdr_buf *buf, size_t len) | |||
428 | { | 428 | { |
429 | xdr_shrink_bufhead(buf, len); | 429 | xdr_shrink_bufhead(buf, len); |
430 | } | 430 | } |
431 | EXPORT_SYMBOL(xdr_shift_buf); | 431 | EXPORT_SYMBOL_GPL(xdr_shift_buf); |
432 | 432 | ||
433 | /** | 433 | /** |
434 | * xdr_init_encode - Initialize a struct xdr_stream for sending data. | 434 | * xdr_init_encode - Initialize a struct xdr_stream for sending data. |
@@ -465,7 +465,7 @@ void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p) | |||
465 | iov->iov_len += len; | 465 | iov->iov_len += len; |
466 | } | 466 | } |
467 | } | 467 | } |
468 | EXPORT_SYMBOL(xdr_init_encode); | 468 | EXPORT_SYMBOL_GPL(xdr_init_encode); |
469 | 469 | ||
470 | /** | 470 | /** |
471 | * xdr_reserve_space - Reserve buffer space for sending | 471 | * xdr_reserve_space - Reserve buffer space for sending |
@@ -492,7 +492,7 @@ __be32 * xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes) | |||
492 | xdr->buf->len += nbytes; | 492 | xdr->buf->len += nbytes; |
493 | return p; | 493 | return p; |
494 | } | 494 | } |
495 | EXPORT_SYMBOL(xdr_reserve_space); | 495 | EXPORT_SYMBOL_GPL(xdr_reserve_space); |
496 | 496 | ||
497 | /** | 497 | /** |
498 | * xdr_write_pages - Insert a list of pages into an XDR buffer for sending | 498 | * xdr_write_pages - Insert a list of pages into an XDR buffer for sending |
@@ -527,7 +527,7 @@ void xdr_write_pages(struct xdr_stream *xdr, struct page **pages, unsigned int b | |||
527 | buf->buflen += len; | 527 | buf->buflen += len; |
528 | buf->len += len; | 528 | buf->len += len; |
529 | } | 529 | } |
530 | EXPORT_SYMBOL(xdr_write_pages); | 530 | EXPORT_SYMBOL_GPL(xdr_write_pages); |
531 | 531 | ||
532 | /** | 532 | /** |
533 | * xdr_init_decode - Initialize an xdr_stream for decoding data. | 533 | * xdr_init_decode - Initialize an xdr_stream for decoding data. |
@@ -547,7 +547,7 @@ void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p) | |||
547 | xdr->p = p; | 547 | xdr->p = p; |
548 | xdr->end = (__be32 *)((char *)iov->iov_base + len); | 548 | xdr->end = (__be32 *)((char *)iov->iov_base + len); |
549 | } | 549 | } |
550 | EXPORT_SYMBOL(xdr_init_decode); | 550 | EXPORT_SYMBOL_GPL(xdr_init_decode); |
551 | 551 | ||
552 | /** | 552 | /** |
553 | * xdr_inline_decode - Retrieve non-page XDR data to decode | 553 | * xdr_inline_decode - Retrieve non-page XDR data to decode |
@@ -569,7 +569,7 @@ __be32 * xdr_inline_decode(struct xdr_stream *xdr, size_t nbytes) | |||
569 | xdr->p = q; | 569 | xdr->p = q; |
570 | return p; | 570 | return p; |
571 | } | 571 | } |
572 | EXPORT_SYMBOL(xdr_inline_decode); | 572 | EXPORT_SYMBOL_GPL(xdr_inline_decode); |
573 | 573 | ||
574 | /** | 574 | /** |
575 | * xdr_read_pages - Ensure page-based XDR data to decode is aligned at current pointer position | 575 | * xdr_read_pages - Ensure page-based XDR data to decode is aligned at current pointer position |
@@ -613,7 +613,7 @@ void xdr_read_pages(struct xdr_stream *xdr, unsigned int len) | |||
613 | xdr->p = (__be32 *)((char *)iov->iov_base + padding); | 613 | xdr->p = (__be32 *)((char *)iov->iov_base + padding); |
614 | xdr->end = (__be32 *)((char *)iov->iov_base + end); | 614 | xdr->end = (__be32 *)((char *)iov->iov_base + end); |
615 | } | 615 | } |
616 | EXPORT_SYMBOL(xdr_read_pages); | 616 | EXPORT_SYMBOL_GPL(xdr_read_pages); |
617 | 617 | ||
618 | /** | 618 | /** |
619 | * xdr_enter_page - decode data from the XDR page | 619 | * xdr_enter_page - decode data from the XDR page |
@@ -638,7 +638,7 @@ void xdr_enter_page(struct xdr_stream *xdr, unsigned int len) | |||
638 | xdr->p = (__be32 *)(kaddr + xdr->buf->page_base); | 638 | xdr->p = (__be32 *)(kaddr + xdr->buf->page_base); |
639 | xdr->end = (__be32 *)((char *)xdr->p + len); | 639 | xdr->end = (__be32 *)((char *)xdr->p + len); |
640 | } | 640 | } |
641 | EXPORT_SYMBOL(xdr_enter_page); | 641 | EXPORT_SYMBOL_GPL(xdr_enter_page); |
642 | 642 | ||
643 | static struct kvec empty_iov = {.iov_base = NULL, .iov_len = 0}; | 643 | static struct kvec empty_iov = {.iov_base = NULL, .iov_len = 0}; |
644 | 644 | ||
@@ -650,7 +650,7 @@ xdr_buf_from_iov(struct kvec *iov, struct xdr_buf *buf) | |||
650 | buf->page_len = 0; | 650 | buf->page_len = 0; |
651 | buf->buflen = buf->len = iov->iov_len; | 651 | buf->buflen = buf->len = iov->iov_len; |
652 | } | 652 | } |
653 | EXPORT_SYMBOL(xdr_buf_from_iov); | 653 | EXPORT_SYMBOL_GPL(xdr_buf_from_iov); |
654 | 654 | ||
655 | /* Sets subbuf to the portion of buf of length len beginning base bytes | 655 | /* Sets subbuf to the portion of buf of length len beginning base bytes |
656 | * from the start of buf. Returns -1 if base of length are out of bounds. */ | 656 | * from the start of buf. Returns -1 if base of length are out of bounds. */ |
@@ -699,7 +699,7 @@ xdr_buf_subsegment(struct xdr_buf *buf, struct xdr_buf *subbuf, | |||
699 | return -1; | 699 | return -1; |
700 | return 0; | 700 | return 0; |
701 | } | 701 | } |
702 | EXPORT_SYMBOL(xdr_buf_subsegment); | 702 | EXPORT_SYMBOL_GPL(xdr_buf_subsegment); |
703 | 703 | ||
704 | static void __read_bytes_from_xdr_buf(struct xdr_buf *subbuf, void *obj, unsigned int len) | 704 | static void __read_bytes_from_xdr_buf(struct xdr_buf *subbuf, void *obj, unsigned int len) |
705 | { | 705 | { |
@@ -730,7 +730,7 @@ int read_bytes_from_xdr_buf(struct xdr_buf *buf, unsigned int base, void *obj, u | |||
730 | __read_bytes_from_xdr_buf(&subbuf, obj, len); | 730 | __read_bytes_from_xdr_buf(&subbuf, obj, len); |
731 | return 0; | 731 | return 0; |
732 | } | 732 | } |
733 | EXPORT_SYMBOL(read_bytes_from_xdr_buf); | 733 | EXPORT_SYMBOL_GPL(read_bytes_from_xdr_buf); |
734 | 734 | ||
735 | static void __write_bytes_to_xdr_buf(struct xdr_buf *subbuf, void *obj, unsigned int len) | 735 | static void __write_bytes_to_xdr_buf(struct xdr_buf *subbuf, void *obj, unsigned int len) |
736 | { | 736 | { |
@@ -774,7 +774,7 @@ xdr_decode_word(struct xdr_buf *buf, unsigned int base, u32 *obj) | |||
774 | *obj = ntohl(raw); | 774 | *obj = ntohl(raw); |
775 | return 0; | 775 | return 0; |
776 | } | 776 | } |
777 | EXPORT_SYMBOL(xdr_decode_word); | 777 | EXPORT_SYMBOL_GPL(xdr_decode_word); |
778 | 778 | ||
779 | int | 779 | int |
780 | xdr_encode_word(struct xdr_buf *buf, unsigned int base, u32 obj) | 780 | xdr_encode_word(struct xdr_buf *buf, unsigned int base, u32 obj) |
@@ -783,7 +783,7 @@ xdr_encode_word(struct xdr_buf *buf, unsigned int base, u32 obj) | |||
783 | 783 | ||
784 | return write_bytes_to_xdr_buf(buf, base, &raw, sizeof(obj)); | 784 | return write_bytes_to_xdr_buf(buf, base, &raw, sizeof(obj)); |
785 | } | 785 | } |
786 | EXPORT_SYMBOL(xdr_encode_word); | 786 | EXPORT_SYMBOL_GPL(xdr_encode_word); |
787 | 787 | ||
788 | /* If the netobj starting offset bytes from the start of xdr_buf is contained | 788 | /* If the netobj starting offset bytes from the start of xdr_buf is contained |
789 | * entirely in the head or the tail, set object to point to it; otherwise | 789 | * entirely in the head or the tail, set object to point to it; otherwise |
@@ -821,7 +821,7 @@ int xdr_buf_read_netobj(struct xdr_buf *buf, struct xdr_netobj *obj, unsigned in | |||
821 | __read_bytes_from_xdr_buf(&subbuf, obj->data, obj->len); | 821 | __read_bytes_from_xdr_buf(&subbuf, obj->data, obj->len); |
822 | return 0; | 822 | return 0; |
823 | } | 823 | } |
824 | EXPORT_SYMBOL(xdr_buf_read_netobj); | 824 | EXPORT_SYMBOL_GPL(xdr_buf_read_netobj); |
825 | 825 | ||
826 | /* Returns 0 on success, or else a negative error code. */ | 826 | /* Returns 0 on success, or else a negative error code. */ |
827 | static int | 827 | static int |
@@ -1027,7 +1027,7 @@ xdr_decode_array2(struct xdr_buf *buf, unsigned int base, | |||
1027 | 1027 | ||
1028 | return xdr_xcode_array2(buf, base, desc, 0); | 1028 | return xdr_xcode_array2(buf, base, desc, 0); |
1029 | } | 1029 | } |
1030 | EXPORT_SYMBOL(xdr_decode_array2); | 1030 | EXPORT_SYMBOL_GPL(xdr_decode_array2); |
1031 | 1031 | ||
1032 | int | 1032 | int |
1033 | xdr_encode_array2(struct xdr_buf *buf, unsigned int base, | 1033 | xdr_encode_array2(struct xdr_buf *buf, unsigned int base, |
@@ -1039,7 +1039,7 @@ xdr_encode_array2(struct xdr_buf *buf, unsigned int base, | |||
1039 | 1039 | ||
1040 | return xdr_xcode_array2(buf, base, desc, 1); | 1040 | return xdr_xcode_array2(buf, base, desc, 1); |
1041 | } | 1041 | } |
1042 | EXPORT_SYMBOL(xdr_encode_array2); | 1042 | EXPORT_SYMBOL_GPL(xdr_encode_array2); |
1043 | 1043 | ||
1044 | int | 1044 | int |
1045 | xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, | 1045 | xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, |
@@ -1106,5 +1106,5 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, | |||
1106 | out: | 1106 | out: |
1107 | return ret; | 1107 | return ret; |
1108 | } | 1108 | } |
1109 | EXPORT_SYMBOL(xdr_process_buf); | 1109 | EXPORT_SYMBOL_GPL(xdr_process_buf); |
1110 | 1110 | ||