Просмотр исходного кода

SUNRPC: Remove unused function xdr_encode_pages

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Trond Myklebust 13 лет назад
Родитель
Сommit
140150dbb1
3 измененных файлов с 1 добавлено и 33 удалено
  1. 1 3
      fs/nfs/nfs4proc.c
  2. 0 2
      include/linux/sunrpc/xdr.h
  3. 0 28
      net/sunrpc/xdr.c

+ 1 - 3
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
  * In the case of WRITE, we also want to put the GETATTR after
  * the operation -- in this case because we want to make sure
  * 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
  * Both of these changes to the XDR layer would in fact be quite
  * minor, but I decided to leave them for a subsequent patch.
  * minor, but I decided to leave them for a subsequent patch.

+ 0 - 2
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_encode_netobj(__be32 *p, const struct xdr_netobj *);
 __be32 *xdr_decode_netobj(__be32 *p, 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,
 void	xdr_inline_pages(struct xdr_buf *, unsigned int,
 			 struct page **, unsigned int, unsigned int);
 			 struct page **, unsigned int, unsigned int);
 void	xdr_terminate_string(struct xdr_buf *, const u32);
 void	xdr_terminate_string(struct xdr_buf *, const u32);

+ 0 - 28
net/sunrpc/xdr.c

@@ -128,34 +128,6 @@ xdr_terminate_string(struct xdr_buf *buf, const u32 len)
 }
 }
 EXPORT_SYMBOL_GPL(xdr_terminate_string);
 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
 void
 xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset,
 xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset,
 		 struct page **pages, unsigned int base, unsigned int len)
 		 struct page **pages, unsigned int base, unsigned int len)