diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-05 15:20:25 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-28 17:20:49 -0400 |
commit | 140150dbb1f9cf3ef963fb55505f994d74ff3276 (patch) | |
tree | ca59a9190eb4e03cc09413d9a19ca24000d71eac | |
parent | b42353ff8d346a2f6afac3e3983b7286ed4238d7 (diff) |
SUNRPC: Remove unused function xdr_encode_pages
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | fs/nfs/nfs4proc.c | 4 | ||||
-rw-r--r-- | include/linux/sunrpc/xdr.h | 2 | ||||
-rw-r--r-- | net/sunrpc/xdr.c | 28 |
3 files changed, 1 insertions, 33 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 15fc7e4664ed..5a7b3723cc6f 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -2766,9 +2766,7 @@ static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry) | |||
2766 | * | 2766 | * |
2767 | * In the case of WRITE, we also want to put the GETATTR after | 2767 | * In the case of WRITE, we also want to put the GETATTR after |
2768 | * the operation -- in this case because we want to make sure | 2768 | * the operation -- in this case because we want to make sure |
2769 | * we get the post-operation mtime and size. This means that | 2769 | * we get the post-operation mtime and size. |
2770 | * we can't use xdr_encode_pages() as written: we need a variant | ||
2771 | * of it which would leave room in the 'tail' iovec. | ||
2772 | * | 2770 | * |
2773 | * Both of these changes to the XDR layer would in fact be quite | 2771 | * Both of these changes to the XDR layer would in fact be quite |
2774 | * minor, but I decided to leave them for a subsequent patch. | 2772 | * minor, but I decided to leave them for a subsequent patch. |
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h index 647faf2289a7..63988990bd36 100644 --- a/include/linux/sunrpc/xdr.h +++ b/include/linux/sunrpc/xdr.h | |||
@@ -104,8 +104,6 @@ __be32 *xdr_decode_string_inplace(__be32 *p, char **sp, unsigned int *lenp, | |||
104 | __be32 *xdr_encode_netobj(__be32 *p, const struct xdr_netobj *); | 104 | __be32 *xdr_encode_netobj(__be32 *p, const struct xdr_netobj *); |
105 | __be32 *xdr_decode_netobj(__be32 *p, struct xdr_netobj *); | 105 | __be32 *xdr_decode_netobj(__be32 *p, struct xdr_netobj *); |
106 | 106 | ||
107 | void xdr_encode_pages(struct xdr_buf *, struct page **, unsigned int, | ||
108 | unsigned int); | ||
109 | void xdr_inline_pages(struct xdr_buf *, unsigned int, | 107 | void xdr_inline_pages(struct xdr_buf *, unsigned int, |
110 | struct page **, unsigned int, unsigned int); | 108 | struct page **, unsigned int, unsigned int); |
111 | void xdr_terminate_string(struct xdr_buf *, const u32); | 109 | void xdr_terminate_string(struct xdr_buf *, const u32); |
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 2e3694eccd82..d65d380571bc 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c | |||
@@ -129,34 +129,6 @@ xdr_terminate_string(struct xdr_buf *buf, const u32 len) | |||
129 | EXPORT_SYMBOL_GPL(xdr_terminate_string); | 129 | EXPORT_SYMBOL_GPL(xdr_terminate_string); |
130 | 130 | ||
131 | void | 131 | void |
132 | xdr_encode_pages(struct xdr_buf *xdr, struct page **pages, unsigned int base, | ||
133 | unsigned int len) | ||
134 | { | ||
135 | struct kvec *tail = xdr->tail; | ||
136 | u32 *p; | ||
137 | |||
138 | xdr->pages = pages; | ||
139 | xdr->page_base = base; | ||
140 | xdr->page_len = len; | ||
141 | |||
142 | p = (u32 *)xdr->head[0].iov_base + XDR_QUADLEN(xdr->head[0].iov_len); | ||
143 | tail->iov_base = p; | ||
144 | tail->iov_len = 0; | ||
145 | |||
146 | if (len & 3) { | ||
147 | unsigned int pad = 4 - (len & 3); | ||
148 | |||
149 | *p = 0; | ||
150 | tail->iov_base = (char *)p + (len & 3); | ||
151 | tail->iov_len = pad; | ||
152 | len += pad; | ||
153 | } | ||
154 | xdr->buflen += len; | ||
155 | xdr->len += len; | ||
156 | } | ||
157 | EXPORT_SYMBOL_GPL(xdr_encode_pages); | ||
158 | |||
159 | void | ||
160 | xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset, | 132 | xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset, |
161 | struct page **pages, unsigned int base, unsigned int len) | 133 | struct page **pages, unsigned int base, unsigned int len) |
162 | { | 134 | { |