SUNRPC: Remove unused function xdr_encode_pages

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 15fc7e4664ed53206074df177efd74e30dd13521..5a7b3723cc6f1a4721b17a94ea2fd4816fd02fff 100644 (file)
--- 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)
  *
  * In the case of WRITE, we also want to put the GETATTR after
  * the operation -- in this case because we want to make sure
- * we get the post-operation mtime and size.  This means that
- * we can't use xdr_encode_pages() as written: we need a variant
- * of it which would leave room in the 'tail' iovec.
+ * we get the post-operation mtime and size.
  *
  * Both of these changes to the XDR layer would in fact be quite
  * 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 647faf2289a7d3d9e86e716d8403dc10b7408a27..63988990bd36d5c81e8537cd1ef1ef2961c30ed6 100644 (file)
--- 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,
 __be32 *xdr_encode_netobj(__be32 *p, const struct xdr_netobj *);
 __be32 *xdr_decode_netobj(__be32 *p, struct xdr_netobj *);
 
-void   xdr_encode_pages(struct xdr_buf *, struct page **, unsigned int,
-                        unsigned int);
 void   xdr_inline_pages(struct xdr_buf *, unsigned int,
                         struct page **, unsigned int, unsigned int);
 void   xdr_terminate_string(struct xdr_buf *, const u32);

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 2e3694eccd82b3e54a2cc5da8eb7d933321cdbbb..d65d380571bc2067817c9216ef1b740544c77863 100644 (file)
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -128,34 +128,6 @@ xdr_terminate_string(struct xdr_buf *buf, const u32 len)
 }
 EXPORT_SYMBOL_GPL(xdr_terminate_string);
 
-void
-xdr_encode_pages(struct xdr_buf *xdr, struct page **pages, unsigned int base,
-                unsigned int len)
-{
-       struct kvec *tail = xdr->tail;
-       u32 *p;
-
-       xdr->pages = pages;
-       xdr->page_base = base;
-       xdr->page_len = len;
-
-       p = (u32 *)xdr->head[0].iov_base + XDR_QUADLEN(xdr->head[0].iov_len);
-       tail->iov_base = p;
-       tail->iov_len = 0;
-
-       if (len & 3) {
-               unsigned int pad = 4 - (len & 3);
-
-               *p = 0;
-               tail->iov_base = (char *)p + (len & 3);
-               tail->iov_len  = pad;
-               len += pad;
-       }
-       xdr->buflen += len;
-       xdr->len += len;
-}
-EXPORT_SYMBOL_GPL(xdr_encode_pages);
-
 void
 xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset,
                 struct page **pages, unsigned int base, unsigned int len)