diff options
author | Adam Litke <agl@us.ibm.com> | 2006-01-06 03:10:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:22 -0500 |
commit | 85ef47f74afe96c8c23eaa605f28cc01443c905f (patch) | |
tree | afe3a52f3e00cbab3f30f756fb60b250fe8de2c6 /mm | |
parent | f0916794f00be44154102dedaeafe68b743078a2 (diff) |
[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>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/hugetlb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index acb864130f80..fdbbbb90caa2 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, | |||
345 | flush_tlb_range(vma, start, end); | 345 | flush_tlb_range(vma, start, end); |
346 | } | 346 | } |
347 | 347 | ||
348 | static struct page *find_lock_huge_page(struct address_space *mapping, | 348 | static struct page *find_or_alloc_huge_page(struct address_space *mapping, |
349 | unsigned long idx) | 349 | unsigned long idx) |
350 | { | 350 | { |
351 | struct page *page; | 351 | struct page *page; |
352 | int err; | 352 | int err; |
@@ -398,7 +398,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, | |||
398 | * Use page lock to guard against racing truncation | 398 | * Use page lock to guard against racing truncation |
399 | * before we get page_table_lock. | 399 | * before we get page_table_lock. |
400 | */ | 400 | */ |
401 | page = find_lock_huge_page(mapping, idx); | 401 | page = find_or_alloc_huge_page(mapping, idx); |
402 | if (!page) | 402 | if (!page) |
403 | goto out; | 403 | goto out; |
404 | 404 | ||