Commit 468039ee authored by Trond Myklebust's avatar Trond Myklebust

SUNRPC: Convert the xdr helpers and rpc_pipefs to EXPORT_SYMBOL_GPL

We've never considered the sunrpc code as part of any ABI to be used by
out-of-tree modules.
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 88a9fe8c
...@@ -113,7 +113,7 @@ rpc_queue_upcall(struct inode *inode, struct rpc_pipe_msg *msg) ...@@ -113,7 +113,7 @@ rpc_queue_upcall(struct inode *inode, struct rpc_pipe_msg *msg)
wake_up(&rpci->waitq); wake_up(&rpci->waitq);
return res; return res;
} }
EXPORT_SYMBOL(rpc_queue_upcall); EXPORT_SYMBOL_GPL(rpc_queue_upcall);
static inline void static inline void
rpc_inode_setowner(struct inode *inode, void *private) rpc_inode_setowner(struct inode *inode, void *private)
...@@ -808,7 +808,7 @@ rpc_mkpipe(struct dentry *parent, const char *name, void *private, struct rpc_pi ...@@ -808,7 +808,7 @@ rpc_mkpipe(struct dentry *parent, const char *name, void *private, struct rpc_pi
-ENOMEM); -ENOMEM);
goto out; goto out;
} }
EXPORT_SYMBOL(rpc_mkpipe); EXPORT_SYMBOL_GPL(rpc_mkpipe);
/** /**
* rpc_unlink - remove a pipe * rpc_unlink - remove a pipe
...@@ -839,7 +839,7 @@ rpc_unlink(struct dentry *dentry) ...@@ -839,7 +839,7 @@ rpc_unlink(struct dentry *dentry)
dput(parent); dput(parent);
return error; return error;
} }
EXPORT_SYMBOL(rpc_unlink); EXPORT_SYMBOL_GPL(rpc_unlink);
/* /*
* populate the filesystem * populate the filesystem
......
...@@ -28,7 +28,7 @@ xdr_encode_netobj(__be32 *p, const struct xdr_netobj *obj) ...@@ -28,7 +28,7 @@ xdr_encode_netobj(__be32 *p, const struct xdr_netobj *obj)
memcpy(p, obj->data, obj->len); memcpy(p, obj->data, obj->len);
return p + XDR_QUADLEN(obj->len); return p + XDR_QUADLEN(obj->len);
} }
EXPORT_SYMBOL(xdr_encode_netobj); EXPORT_SYMBOL_GPL(xdr_encode_netobj);
__be32 * __be32 *
xdr_decode_netobj(__be32 *p, struct xdr_netobj *obj) xdr_decode_netobj(__be32 *p, struct xdr_netobj *obj)
...@@ -41,7 +41,7 @@ xdr_decode_netobj(__be32 *p, struct xdr_netobj *obj) ...@@ -41,7 +41,7 @@ xdr_decode_netobj(__be32 *p, struct xdr_netobj *obj)
obj->data = (u8 *) p; obj->data = (u8 *) p;
return p + XDR_QUADLEN(len); return p + XDR_QUADLEN(len);
} }
EXPORT_SYMBOL(xdr_decode_netobj); EXPORT_SYMBOL_GPL(xdr_decode_netobj);
/** /**
* xdr_encode_opaque_fixed - Encode fixed length opaque data * 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,7 +71,7 @@ __be32 *xdr_encode_opaque_fixed(__be32 *p, const void *ptr, unsigned int nbytes)
} }
return p; return p;
} }
EXPORT_SYMBOL(xdr_encode_opaque_fixed); EXPORT_SYMBOL_GPL(xdr_encode_opaque_fixed);
/** /**
* xdr_encode_opaque - Encode variable length opaque data * 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,14 +86,14 @@ __be32 *xdr_encode_opaque(__be32 *p, const void *ptr, unsigned int nbytes)
*p++ = htonl(nbytes); *p++ = htonl(nbytes);
return xdr_encode_opaque_fixed(p, ptr, nbytes); return xdr_encode_opaque_fixed(p, ptr, nbytes);
} }
EXPORT_SYMBOL(xdr_encode_opaque); EXPORT_SYMBOL_GPL(xdr_encode_opaque);
__be32 * __be32 *
xdr_encode_string(__be32 *p, const char *string) xdr_encode_string(__be32 *p, const char *string)
{ {
return xdr_encode_array(p, string, strlen(string)); return xdr_encode_array(p, string, strlen(string));
} }
EXPORT_SYMBOL(xdr_encode_string); EXPORT_SYMBOL_GPL(xdr_encode_string);
__be32 * __be32 *
xdr_decode_string_inplace(__be32 *p, char **sp, xdr_decode_string_inplace(__be32 *p, char **sp,
...@@ -108,7 +108,7 @@ xdr_decode_string_inplace(__be32 *p, char **sp, ...@@ -108,7 +108,7 @@ xdr_decode_string_inplace(__be32 *p, char **sp,
*sp = (char *) p; *sp = (char *) p;
return p + XDR_QUADLEN(len); return p + XDR_QUADLEN(len);
} }
EXPORT_SYMBOL(xdr_decode_string_inplace); EXPORT_SYMBOL_GPL(xdr_decode_string_inplace);
void void
xdr_encode_pages(struct xdr_buf *xdr, struct page **pages, unsigned int base, 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,7 +136,7 @@ xdr_encode_pages(struct xdr_buf *xdr, struct page **pages, unsigned int base,
xdr->buflen += len; xdr->buflen += len;
xdr->len += len; xdr->len += len;
} }
EXPORT_SYMBOL(xdr_encode_pages); EXPORT_SYMBOL_GPL(xdr_encode_pages);
void void
xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset, 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,7 +158,7 @@ xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset,
xdr->buflen += len; xdr->buflen += len;
} }
EXPORT_SYMBOL(xdr_inline_pages); EXPORT_SYMBOL_GPL(xdr_inline_pages);
/* /*
* Helper routines for doing 'memmove' like operations on a struct xdr_buf * 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,7 +428,7 @@ xdr_shift_buf(struct xdr_buf *buf, size_t len)
{ {
xdr_shrink_bufhead(buf, len); xdr_shrink_bufhead(buf, len);
} }
EXPORT_SYMBOL(xdr_shift_buf); EXPORT_SYMBOL_GPL(xdr_shift_buf);
/** /**
* xdr_init_encode - Initialize a struct xdr_stream for sending data. * 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,7 +465,7 @@ void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p)
iov->iov_len += len; iov->iov_len += len;
} }
} }
EXPORT_SYMBOL(xdr_init_encode); EXPORT_SYMBOL_GPL(xdr_init_encode);
/** /**
* xdr_reserve_space - Reserve buffer space for sending * xdr_reserve_space - Reserve buffer space for sending
...@@ -492,7 +492,7 @@ __be32 * xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes) ...@@ -492,7 +492,7 @@ __be32 * xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes)
xdr->buf->len += nbytes; xdr->buf->len += nbytes;
return p; return p;
} }
EXPORT_SYMBOL(xdr_reserve_space); EXPORT_SYMBOL_GPL(xdr_reserve_space);
/** /**
* xdr_write_pages - Insert a list of pages into an XDR buffer for sending * 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,7 +527,7 @@ void xdr_write_pages(struct xdr_stream *xdr, struct page **pages, unsigned int b
buf->buflen += len; buf->buflen += len;
buf->len += len; buf->len += len;
} }
EXPORT_SYMBOL(xdr_write_pages); EXPORT_SYMBOL_GPL(xdr_write_pages);
/** /**
* xdr_init_decode - Initialize an xdr_stream for decoding data. * 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,7 +547,7 @@ void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p)
xdr->p = p; xdr->p = p;
xdr->end = (__be32 *)((char *)iov->iov_base + len); xdr->end = (__be32 *)((char *)iov->iov_base + len);
} }
EXPORT_SYMBOL(xdr_init_decode); EXPORT_SYMBOL_GPL(xdr_init_decode);
/** /**
* xdr_inline_decode - Retrieve non-page XDR data to decode * 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,7 +569,7 @@ __be32 * xdr_inline_decode(struct xdr_stream *xdr, size_t nbytes)
xdr->p = q; xdr->p = q;
return p; return p;
} }
EXPORT_SYMBOL(xdr_inline_decode); EXPORT_SYMBOL_GPL(xdr_inline_decode);
/** /**
* xdr_read_pages - Ensure page-based XDR data to decode is aligned at current pointer position * 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,7 +613,7 @@ void xdr_read_pages(struct xdr_stream *xdr, unsigned int len)
xdr->p = (__be32 *)((char *)iov->iov_base + padding); xdr->p = (__be32 *)((char *)iov->iov_base + padding);
xdr->end = (__be32 *)((char *)iov->iov_base + end); xdr->end = (__be32 *)((char *)iov->iov_base + end);
} }
EXPORT_SYMBOL(xdr_read_pages); EXPORT_SYMBOL_GPL(xdr_read_pages);
/** /**
* xdr_enter_page - decode data from the XDR page * 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,7 +638,7 @@ void xdr_enter_page(struct xdr_stream *xdr, unsigned int len)
xdr->p = (__be32 *)(kaddr + xdr->buf->page_base); xdr->p = (__be32 *)(kaddr + xdr->buf->page_base);
xdr->end = (__be32 *)((char *)xdr->p + len); xdr->end = (__be32 *)((char *)xdr->p + len);
} }
EXPORT_SYMBOL(xdr_enter_page); EXPORT_SYMBOL_GPL(xdr_enter_page);
static struct kvec empty_iov = {.iov_base = NULL, .iov_len = 0}; static struct kvec empty_iov = {.iov_base = NULL, .iov_len = 0};
...@@ -650,7 +650,7 @@ xdr_buf_from_iov(struct kvec *iov, struct xdr_buf *buf) ...@@ -650,7 +650,7 @@ xdr_buf_from_iov(struct kvec *iov, struct xdr_buf *buf)
buf->page_len = 0; buf->page_len = 0;
buf->buflen = buf->len = iov->iov_len; buf->buflen = buf->len = iov->iov_len;
} }
EXPORT_SYMBOL(xdr_buf_from_iov); EXPORT_SYMBOL_GPL(xdr_buf_from_iov);
/* Sets subbuf to the portion of buf of length len beginning base bytes /* Sets subbuf to the portion of buf of length len beginning base bytes
* from the start of buf. Returns -1 if base of length are out of bounds. */ * 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,7 +699,7 @@ xdr_buf_subsegment(struct xdr_buf *buf, struct xdr_buf *subbuf,
return -1; return -1;
return 0; return 0;
} }
EXPORT_SYMBOL(xdr_buf_subsegment); EXPORT_SYMBOL_GPL(xdr_buf_subsegment);
static void __read_bytes_from_xdr_buf(struct xdr_buf *subbuf, void *obj, unsigned int len) static void __read_bytes_from_xdr_buf(struct xdr_buf *subbuf, void *obj, unsigned int len)
{ {
...@@ -730,7 +730,7 @@ int read_bytes_from_xdr_buf(struct xdr_buf *buf, unsigned int base, void *obj, u ...@@ -730,7 +730,7 @@ int read_bytes_from_xdr_buf(struct xdr_buf *buf, unsigned int base, void *obj, u
__read_bytes_from_xdr_buf(&subbuf, obj, len); __read_bytes_from_xdr_buf(&subbuf, obj, len);
return 0; return 0;
} }
EXPORT_SYMBOL(read_bytes_from_xdr_buf); EXPORT_SYMBOL_GPL(read_bytes_from_xdr_buf);
static void __write_bytes_to_xdr_buf(struct xdr_buf *subbuf, void *obj, unsigned int len) static void __write_bytes_to_xdr_buf(struct xdr_buf *subbuf, void *obj, unsigned int len)
{ {
...@@ -774,7 +774,7 @@ xdr_decode_word(struct xdr_buf *buf, unsigned int base, u32 *obj) ...@@ -774,7 +774,7 @@ xdr_decode_word(struct xdr_buf *buf, unsigned int base, u32 *obj)
*obj = ntohl(raw); *obj = ntohl(raw);
return 0; return 0;
} }
EXPORT_SYMBOL(xdr_decode_word); EXPORT_SYMBOL_GPL(xdr_decode_word);
int int
xdr_encode_word(struct xdr_buf *buf, unsigned int base, u32 obj) 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,7 +783,7 @@ xdr_encode_word(struct xdr_buf *buf, unsigned int base, u32 obj)
return write_bytes_to_xdr_buf(buf, base, &raw, sizeof(obj)); return write_bytes_to_xdr_buf(buf, base, &raw, sizeof(obj));
} }
EXPORT_SYMBOL(xdr_encode_word); EXPORT_SYMBOL_GPL(xdr_encode_word);
/* If the netobj starting offset bytes from the start of xdr_buf is contained /* If the netobj starting offset bytes from the start of xdr_buf is contained
* entirely in the head or the tail, set object to point to it; otherwise * 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,7 +821,7 @@ int xdr_buf_read_netobj(struct xdr_buf *buf, struct xdr_netobj *obj, unsigned in
__read_bytes_from_xdr_buf(&subbuf, obj->data, obj->len); __read_bytes_from_xdr_buf(&subbuf, obj->data, obj->len);
return 0; return 0;
} }
EXPORT_SYMBOL(xdr_buf_read_netobj); EXPORT_SYMBOL_GPL(xdr_buf_read_netobj);
/* Returns 0 on success, or else a negative error code. */ /* Returns 0 on success, or else a negative error code. */
static int static int
...@@ -1027,7 +1027,7 @@ xdr_decode_array2(struct xdr_buf *buf, unsigned int base, ...@@ -1027,7 +1027,7 @@ xdr_decode_array2(struct xdr_buf *buf, unsigned int base,
return xdr_xcode_array2(buf, base, desc, 0); return xdr_xcode_array2(buf, base, desc, 0);
} }
EXPORT_SYMBOL(xdr_decode_array2); EXPORT_SYMBOL_GPL(xdr_decode_array2);
int int
xdr_encode_array2(struct xdr_buf *buf, unsigned int base, 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,7 +1039,7 @@ xdr_encode_array2(struct xdr_buf *buf, unsigned int base,
return xdr_xcode_array2(buf, base, desc, 1); return xdr_xcode_array2(buf, base, desc, 1);
} }
EXPORT_SYMBOL(xdr_encode_array2); EXPORT_SYMBOL_GPL(xdr_encode_array2);
int int
xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, 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,5 +1106,5 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len,
out: out:
return ret; return ret;
} }
EXPORT_SYMBOL(xdr_process_buf); EXPORT_SYMBOL_GPL(xdr_process_buf);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment