diff --git a/[refs] b/[refs] index d434e19e13d9..1c8ff00f946f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6b3ec238d12c8cc6cc71490c6e3127988460349 +refs/heads/master: f0916794f00be44154102dedaeafe68b743078a2 diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index 3e52df7c471b..acb864130f80 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -350,19 +350,12 @@ static struct page *find_lock_huge_page(struct address_space *mapping, { struct page *page; int err; - struct inode *inode = mapping->host; - unsigned long size; retry: page = find_lock_page(mapping, idx); if (page) goto out; - /* Check to make sure the mapping hasn't been truncated */ - size = i_size_read(inode) >> HPAGE_SHIFT; - if (idx >= size) - goto out; - if (hugetlb_get_quota(mapping)) goto out; page = alloc_huge_page();