Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 16300
b: refs/heads/master
c: f091679
h: refs/heads/master
v: v3
  • Loading branch information
Adam Litke authored and Linus Torvalds committed Jan 6, 2006
1 parent 1948bcb commit 9627f2e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f6b3ec238d12c8cc6cc71490c6e3127988460349
refs/heads/master: f0916794f00be44154102dedaeafe68b743078a2
7 changes: 0 additions & 7 deletions trunk/mm/hugetlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 9627f2e

Please sign in to comment.