Commit ad6c4412 authored by John Hubbard's avatar John Hubbard Committed by Linus Torvalds
Browse files

mm/gup: remove unused pin_user_pages_locked() 

This routine was used for a short while, but then the calling code was
refactored and the only caller was removed.

Link: https://lkml.kernel.org/r/20220204020010.68930-4-jhubbard@nvidia.com


Signed-off-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 65462462

include/linux/mm.h

+0 −2
Original line number Diff line number Diff line
@@ -1918,8 +1918,6 @@ long pin_user_pages(unsigned long start, unsigned long nr_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 pin_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,

mm/gup.c

+0 −29
Original line number Diff line number Diff line
@@ -3127,32 +3127,3 @@ long pin_user_pages_unlocked(unsigned long start, unsigned long nr_pages, 
	return get_user_pages_unlocked(start, nr_pages, pages, gup_flags);

}

EXPORT_SYMBOL(pin_user_pages_unlocked);
 


/*

 * pin_user_pages_locked() is the FOLL_PIN variant of get_user_pages_locked().

 * Behavior is the same, except that this one sets FOLL_PIN and rejects

 * FOLL_GET.

 */

long pin_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_GET and FOLL_PIN are mutually exclusive. */

	if (WARN_ON_ONCE(gup_flags & FOLL_GET))

		return -EINVAL;



	gup_flags |= FOLL_PIN;

	return __get_user_pages_locked(current->mm, start, nr_pages,

				       pages, NULL, locked,

				       gup_flags | FOLL_TOUCH);

}

EXPORT_SYMBOL(pin_user_pages_locked);