Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85ef47f7 authored by Adam Litke's avatar Adam Litke Committed by Linus Torvalds
Browse files

[PATCH] Hugetlb: Rename find_lock_page to find_or_alloc_huge_page 



find_lock_huge_page() isn't a great name, since it does extra things not
analagous to find_lock_page().  Rename it find_or_alloc_huge_page() which is
closer to the mark.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAdam Litke <agl@us.ibm.com>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: "Seth, Rohit" <rohit.seth@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f0916794

mm/hugetlb.c

+3 −3
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, 
	flush_tlb_range(vma, start, end);

}



static struct page *find_lock_huge_page(struct address_space *mapping,

static struct page *find_or_alloc_huge_page(struct address_space *mapping,

						unsigned long idx)

{

	struct page *page;
@@ -398,7 +398,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, 
	 * Use page lock to guard against racing truncation

	 * before we get page_table_lock.

	 */

	page = find_lock_huge_page(mapping, idx);

	page = find_or_alloc_huge_page(mapping, idx);

	if (!page)

		goto out;