From: Adam Litke 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: David Gibson Signed-off-by: Adam Litke Cc: William Lee Irwin III Cc: "Seth, Rohit" Signed-off-by: Andrew Morton --- mm/hugetlb.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN mm/hugetlb.c~hugetlb-rename-find_lock_page-to mm/hugetlb.c --- devel/mm/hugetlb.c~hugetlb-rename-find_lock_page-to 2005-11-22 22:30:24.000000000 -0800 +++ devel-akpm/mm/hugetlb.c 2005-11-22 22:30:24.000000000 -0800 @@ -345,8 +345,8 @@ void unmap_hugepage_range(struct vm_area flush_tlb_range(vma, start, end); } -static struct page *find_lock_huge_page(struct address_space *mapping, - unsigned long idx) +static struct page *find_or_alloc_huge_page(struct address_space *mapping, + unsigned long idx) { struct page *page; int err; @@ -398,7 +398,7 @@ int hugetlb_fault(struct mm_struct *mm, * 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; _