aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAdam Litke <agl@us.ibm.com>2006-01-06 03:10:40 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 11:33:22 -0500
commitf0916794f00be44154102dedaeafe68b743078a2 (patch)
tree0faa7e86d938c184f5ccead70410b4d014c2bdf2 /mm
parentf6b3ec238d12c8cc6cc71490c6e3127988460349 (diff)
[PATCH] Hugetlb: Remove duplicate i_size check
cleanup 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.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 3e52df7c471b..acb864130f80 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -350,19 +350,12 @@ static struct page *find_lock_huge_page(struct address_space *mapping,
350{ 350{
351 struct page *page; 351 struct page *page;
352 int err; 352 int err;
353 struct inode *inode = mapping->host;
354 unsigned long size;
355 353
356retry: 354retry:
357 page = find_lock_page(mapping, idx); 355 page = find_lock_page(mapping, idx);
358 if (page) 356 if (page)
359 goto out; 357 goto out;
360 358
361 /* Check to make sure the mapping hasn't been truncated */
362 size = i_size_read(inode) >> HPAGE_SHIFT;
363 if (idx >= size)
364 goto out;
365
366 if (hugetlb_get_quota(mapping)) 359 if (hugetlb_get_quota(mapping))
367 goto out; 360 goto out;
368 page = alloc_huge_page(); 361 page = alloc_huge_page();