net/9p: remove (now-)unused helpers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/net/9p/trans_common.c b/net/9p/trans_common.c
index 2ee3879161b1769f456501044a08c8ebfda420a0..38aa6345bdfa2ec9fc52155e5b0eb3b369fdf463 100644 (file)
--- a/net/9p/trans_common.c
+++ b/net/9p/trans_common.c
@@ -12,12 +12,8 @@
  *
  */
 
-#include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/module.h>
-#include <net/9p/9p.h>
-#include <net/9p/client.h>
-#include <linux/scatterlist.h>
-#include "trans_common.h"
 
 /**
  *  p9_release_req_pages - Release pages after the transaction.
@@ -31,39 +27,3 @@ void p9_release_pages(struct page **pages, int nr_pages)
                        put_page(pages[i]);
 }
 EXPORT_SYMBOL(p9_release_pages);
-
-/**
- * p9_nr_pages - Return number of pages needed to accommodate the payload.
- */
-int p9_nr_pages(char *data, int len)
-{
-       unsigned long start_page, end_page;
-       start_page =  (unsigned long)data >> PAGE_SHIFT;
-       end_page = ((unsigned long)data + len + PAGE_SIZE - 1) >> PAGE_SHIFT;
-       return end_page - start_page;
-}
-EXPORT_SYMBOL(p9_nr_pages);
-
-/**
- * payload_gup - Translates user buffer into kernel pages and
- * pins them either for read/write through get_user_pages_fast().
- * @req: Request to be sent to server.
- * @pdata_off: data offset into the first page after translation (gup).
- * @pdata_len: Total length of the IO. gup may not return requested # of pages.
- * @nr_pages: number of pages to accommodate the payload
- * @rw: Indicates if the pages are for read or write.
- */
-
-int p9_payload_gup(char *data, int *nr_pages, struct page **pages, int write)
-{
-       int nr_mapped_pages;
-
-       nr_mapped_pages = get_user_pages_fast((unsigned long)data,
-                                             *nr_pages, write, pages);
-       if (nr_mapped_pages <= 0)
-               return nr_mapped_pages;
-
-       *nr_pages = nr_mapped_pages;
-       return 0;
-}
-EXPORT_SYMBOL(p9_payload_gup);

diff --git a/net/9p/trans_common.h b/net/9p/trans_common.h
index 173bb550a9eb163df30c3b46b8770d0a37c84aa3..c43babb3f6354ea15bdf125352b6de83fb670af1 100644 (file)
--- a/net/9p/trans_common.h
+++ b/net/9p/trans_common.h
@@ -13,5 +13,3 @@
  */
 
 void p9_release_pages(struct page **, int);
-int p9_payload_gup(char *, int *, struct page **, int);
-int p9_nr_pages(char *, int);