lkml.org 
[lkml]   [2022]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 5/5] mm/gup: remove unused get_user_pages_locked()
    Date
    Now that the last caller of get_user_pages_locked() is gone, remove it.

    Cc: Christoph Hellwig <hch@infradead.org>
    Reviewed-by: Jan Kara <jack@suse.cz>
    Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
    Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
    Signed-off-by: John Hubbard <jhubbard@nvidia.com>
    ---
    include/linux/mm.h | 2 --
    mm/gup.c | 59 ----------------------------------------------
    2 files changed, 61 deletions(-)

    diff --git a/include/linux/mm.h b/include/linux/mm.h
    index 80c540c17d83..528ef1cb4f3a 100644
    --- a/include/linux/mm.h
    +++ b/include/linux/mm.h
    @@ -1916,8 +1916,6 @@ long get_user_pages(unsigned long start, unsigned long nr_pages,
    long pin_user_pages(unsigned long start, unsigned long nr_pages,
    unsigned int gup_flags, struct page **pages,
    struct vm_area_struct **vmas);
    -long get_user_pages_locked(unsigned long start, unsigned long nr_pages,
    - unsigned int gup_flags, struct page **pages, int *locked);
    long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages,
    struct page **pages, unsigned int gup_flags);
    long pin_user_pages_unlocked(unsigned long start, unsigned long nr_pages,
    diff --git a/mm/gup.c b/mm/gup.c
    index 6664dfa7a38f..7337520afa49 100644
    --- a/mm/gup.c
    +++ b/mm/gup.c
    @@ -2145,65 +2145,6 @@ long get_user_pages(unsigned long start, unsigned long nr_pages,
    }
    EXPORT_SYMBOL(get_user_pages);

    -/**
    - * get_user_pages_locked() - variant of get_user_pages()
    - *
    - * @start: starting user address
    - * @nr_pages: number of pages from start to pin
    - * @gup_flags: flags modifying lookup behaviour
    - * @pages: array that receives pointers to the pages pinned.
    - * Should be at least nr_pages long. Or NULL, if caller
    - * only intends to ensure the pages are faulted in.
    - * @locked: pointer to lock flag indicating whether lock is held and
    - * subsequently whether VM_FAULT_RETRY functionality can be
    - * utilised. Lock must initially be held.
    - *
    - * It is suitable to replace the form:
    - *
    - * mmap_read_lock(mm);
    - * do_something()
    - * get_user_pages(mm, ..., pages, NULL);
    - * mmap_read_unlock(mm);
    - *
    - * to:
    - *
    - * int locked = 1;
    - * mmap_read_lock(mm);
    - * do_something()
    - * get_user_pages_locked(mm, ..., pages, &locked);
    - * if (locked)
    - * mmap_read_unlock(mm);
    - *
    - * We can leverage the VM_FAULT_RETRY functionality in the page fault
    - * paths better by using either get_user_pages_locked() or
    - * get_user_pages_unlocked().
    - *
    - */
    -long get_user_pages_locked(unsigned long start, unsigned long nr_pages,
    - unsigned int gup_flags, struct page **pages,
    - int *locked)
    -{
    - /*
    - * FIXME: Current FOLL_LONGTERM behavior is incompatible with
    - * FAULT_FLAG_ALLOW_RETRY because of the FS DAX check requirement on
    - * vmas. As there are no users of this flag in this call we simply
    - * disallow this option for now.
    - */
    - if (WARN_ON_ONCE(gup_flags & FOLL_LONGTERM))
    - return -EINVAL;
    - /*
    - * FOLL_PIN must only be set internally by the pin_user_pages*() APIs,
    - * never directly by the caller, so enforce that:
    - */
    - if (WARN_ON_ONCE(gup_flags & FOLL_PIN))
    - return -EINVAL;
    -
    - return __get_user_pages_locked(current->mm, start, nr_pages,
    - pages, NULL, locked,
    - gup_flags | FOLL_TOUCH);
    -}
    -EXPORT_SYMBOL(get_user_pages_locked);
    -
    /*
    * get_user_pages_unlocked() is suitable to replace the form:
    *
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-02-04 03:01    [W:3.637 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site