From: Adam Litke <agl@us.ibm.com>
Date: Fri, 6 Jan 2006 08:10:42 +0000 (-0800)
Subject: [PATCH] Hugetlb: Rename find_lock_page to find_or_alloc_huge_page
X-Git-Tag: v2.6.16-rc1~936^2~275
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=85ef47f74afe96c8c23eaa605f28cc01443c905f;p=linux-2.6-omap-h63xx.git

[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: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Adam Litke <agl@us.ibm.com>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: "Seth, Rohit" <rohit.seth@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index acb864130f8..fdbbbb90caa 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -345,8 +345,8 @@ 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,
-			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, 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;