2019-05-01 20:44:48

by Christoph Hellwig

Subject: [PATCH] ceph: remove ceph_get_direct_page_vector

This function is entirely unused.

Signed-off-by: Christoph Hellwig <[email protected]>
---
include/linux/ceph/libceph.h | 4 ----
net/ceph/pagevec.c | 33 ---------------------------------
2 files changed, 37 deletions(-)

diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 337d5049ff93..a3cddf5f0e60 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -299,10 +299,6 @@ int ceph_wait_for_latest_osdmap(struct ceph_client *client,

/* pagevec.c */
extern void ceph_release_page_vector(struct page **pages, int num_pages);
-
-extern struct page **ceph_get_direct_page_vector(const void __user *data,
- int num_pages,
- bool write_page);
extern void ceph_put_page_vector(struct page **pages, int num_pages,
bool dirty);
extern struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags);
diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
index d3736f5bffec..64305e7056a1 100644
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -10,39 +10,6 @@

#include <linux/ceph/libceph.h>

-/*
- * build a vector of user pages
- */
-struct page **ceph_get_direct_page_vector(const void __user *data,
- int num_pages, bool write_page)
-{
- struct page **pages;
- int got = 0;
- int rc = 0;
-
- pages = kmalloc_array(num_pages, sizeof(*pages), GFP_NOFS);
- if (!pages)
- return ERR_PTR(-ENOMEM);
-
- while (got < num_pages) {
- rc = get_user_pages_fast(
- (unsigned long)data + ((unsigned long)got * PAGE_SIZE),
- num_pages - got, write_page, pages + got);
- if (rc < 0)
- break;
- BUG_ON(rc == 0);
- got += rc;
- }
- if (rc < 0)
- goto fail;
- return pages;
-
-fail:
- ceph_put_page_vector(pages, got, false);
- return ERR_PTR(rc);
-}
-EXPORT_SYMBOL(ceph_get_direct_page_vector);
-
void ceph_put_page_vector(struct page **pages, int num_pages, bool dirty)
{
int i;
--
2.20.1

2019-05-02 13:47:26

by Ilya Dryomov

Subject: Re: [PATCH] ceph: remove ceph_get_direct_page_vector

On Wed, May 1, 2019 at 10:43 PM Christoph Hellwig <[email protected]> wrote:
>
> This function is entirely unused.
>
> Signed-off-by: Christoph Hellwig <[email protected]>
> ---
> include/linux/ceph/libceph.h | 4 ----
> net/ceph/pagevec.c | 33 ---------------------------------
> 2 files changed, 37 deletions(-)
>
> diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
> index 337d5049ff93..a3cddf5f0e60 100644
> --- a/include/linux/ceph/libceph.h
> +++ b/include/linux/ceph/libceph.h
> @@ -299,10 +299,6 @@ int ceph_wait_for_latest_osdmap(struct ceph_client *client,
>
> /* pagevec.c */
> extern void ceph_release_page_vector(struct page **pages, int num_pages);
> -
> -extern struct page **ceph_get_direct_page_vector(const void __user *data,
> - int num_pages,
> - bool write_page);
> extern void ceph_put_page_vector(struct page **pages, int num_pages,
> bool dirty);
> extern struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags);
> diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
> index d3736f5bffec..64305e7056a1 100644
> --- a/net/ceph/pagevec.c
> +++ b/net/ceph/pagevec.c
> @@ -10,39 +10,6 @@
>
> #include <linux/ceph/libceph.h>
>
> -/*
> - * build a vector of user pages
> - */
> -struct page **ceph_get_direct_page_vector(const void __user *data,
> - int num_pages, bool write_page)
> -{
> - struct page **pages;
> - int got = 0;
> - int rc = 0;
> -
> - pages = kmalloc_array(num_pages, sizeof(*pages), GFP_NOFS);
> - if (!pages)
> - return ERR_PTR(-ENOMEM);
> -
> - while (got < num_pages) {
> - rc = get_user_pages_fast(
> - (unsigned long)data + ((unsigned long)got * PAGE_SIZE),
> - num_pages - got, write_page, pages + got);
> - if (rc < 0)
> - break;
> - BUG_ON(rc == 0);
> - got += rc;
> - }
> - if (rc < 0)
> - goto fail;
> - return pages;
> -
> -fail:
> - ceph_put_page_vector(pages, got, false);
> - return ERR_PTR(rc);
> -}
> -EXPORT_SYMBOL(ceph_get_direct_page_vector);
> -
> void ceph_put_page_vector(struct page **pages, int num_pages, bool dirty)
> {
> int i;

Applied.

Thanks,

Ilya