mm/gup: don't call __gup_longterm_locked() if FOLL_LONGTERM cannot be set

get_user_pages_remote(), get_user_pages_unlocked() and get_user_pages()
are never called with FOLL_LONGTERM, so directly call
__get_user_pages_locked()

The next patch will add an assertion for this.

Link: https://lkml.kernel.org/r/3-v2-987e91b59705+36b-gup_tidy_jgg@nvidia.com
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Suggested-by: John Hubbard <jhubbard@nvidia.com>
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Claudio Imbrenda <imbrenda@linux.ibm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/gup.c b/mm/gup.c
index 5b03d2fd3e1cb0e5ccebefc1086c9f7ec33ce005..9bd4d775716a1f858adfca349fb0c41d00858d05 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2200,8 +2200,8 @@ long get_user_pages_remote(struct mm_struct *mm,
        if (!is_valid_gup_flags(gup_flags))
                return -EINVAL;
 
-       return __gup_longterm_locked(mm, start, nr_pages, pages, vmas, locked,
-                                    gup_flags | FOLL_TOUCH | FOLL_REMOTE);
+       return __get_user_pages_locked(mm, start, nr_pages, pages, vmas, locked,
+                                      gup_flags | FOLL_TOUCH | FOLL_REMOTE);
 }
 EXPORT_SYMBOL(get_user_pages_remote);
 
@@ -2238,8 +2238,8 @@ long get_user_pages(unsigned long start, unsigned long nr_pages,
        if (!is_valid_gup_flags(gup_flags))
                return -EINVAL;
 
-       return __gup_longterm_locked(current->mm, start, nr_pages,
-                                    pages, vmas, NULL, gup_flags | FOLL_TOUCH);
+       return __get_user_pages_locked(current->mm, start, nr_pages, pages,
+                                      vmas, NULL, gup_flags | FOLL_TOUCH);
 }
 EXPORT_SYMBOL(get_user_pages);
 
@@ -2263,8 +2263,8 @@ long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages,
 {
        int locked = 0;
 
-       return __gup_longterm_locked(current->mm, start, nr_pages, pages, NULL,
-                                    &locked, gup_flags | FOLL_TOUCH);
+       return __get_user_pages_locked(current->mm, start, nr_pages, pages,
+                                      NULL, &locked, gup_flags | FOLL_TOUCH);
 }
 EXPORT_SYMBOL(get_user_pages_unlocked);