Commit 4628b063 authored by Pingfan Liu's avatar Pingfan Liu Committed by Linus Torvalds
Browse files

mm/gup: rename nr as nr_pinned in get_user_pages_fast() 



To better reflect the held state of pages and make code self-explaining,
rename nr as nr_pinned.

Signed-off-by: default avatarPingfan Liu <kernelfans@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Link: http://lkml.kernel.org/r/1584876733-17405-2-git-send-email-kernelfans@gmail.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f28d4363

mm/gup.c

+13 −13
Original line number Diff line number Diff line
@@ -2637,7 +2637,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write, 
{

	unsigned long len, end;

	unsigned long flags;

	int nr = 0;

	int nr_pinned = 0;

	/*

	 * Internally (within mm/gup.c), gup fast variants must set FOLL_GET,

	 * because gup fast is always a "pin with a +1 page refcount" request.
@@ -2671,11 +2671,11 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write, 
	if (IS_ENABLED(CONFIG_HAVE_FAST_GUP) &&

	    gup_fast_permitted(start, end)) {

		local_irq_save(flags);

		gup_pgd_range(start, end, gup_flags, pages, &nr);

		gup_pgd_range(start, end, gup_flags, pages, &nr_pinned);

		local_irq_restore(flags);

	}



	return nr;

	return nr_pinned;

}

EXPORT_SYMBOL_GPL(__get_user_pages_fast);
@@ -2707,7 +2707,7 @@ static int internal_get_user_pages_fast(unsigned long start, int nr_pages, 
					struct page **pages)

{

	unsigned long addr, len, end;

	int nr = 0, ret = 0;

	int nr_pinned = 0, ret = 0;



	if (WARN_ON_ONCE(gup_flags & ~(FOLL_WRITE | FOLL_LONGTERM |

				       FOLL_FORCE | FOLL_PIN | FOLL_GET)))
@@ -2726,25 +2726,25 @@ static int internal_get_user_pages_fast(unsigned long start, int nr_pages, 
	if (IS_ENABLED(CONFIG_HAVE_FAST_GUP) &&

	    gup_fast_permitted(start, end)) {

		local_irq_disable();

		gup_pgd_range(addr, end, gup_flags, pages, &nr);

		gup_pgd_range(addr, end, gup_flags, pages, &nr_pinned);

		local_irq_enable();

		ret = nr;

		ret = nr_pinned;

	}



	if (nr < nr_pages) {

	if (nr_pinned < nr_pages) {

		/* Try to get the remaining pages with get_user_pages */

		start += nr << PAGE_SHIFT;

		pages += nr;

		start += nr_pinned << PAGE_SHIFT;

		pages += nr_pinned;



		ret = __gup_longterm_unlocked(start, nr_pages - nr,

		ret = __gup_longterm_unlocked(start, nr_pages - nr_pinned,

					      gup_flags, pages);



		/* Have to be a bit careful with return values */

		if (nr > 0) {

		if (nr_pinned > 0) {

			if (ret < 0)

				ret = nr;

				ret = nr_pinned;

			else

				ret += nr;

				ret += nr_pinned;

		}

	}