diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /fs/hugetlbfs/inode.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'fs/hugetlbfs/inode.c')
| -rw-r--r-- | fs/hugetlbfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index f568102da1e8..b35195289945 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
| @@ -72,8 +72,8 @@ huge_pages_needed(struct address_space *mapping, struct vm_area_struct *vma) | |||
| 72 | unsigned long start = vma->vm_start; | 72 | unsigned long start = vma->vm_start; |
| 73 | unsigned long end = vma->vm_end; | 73 | unsigned long end = vma->vm_end; |
| 74 | unsigned long hugepages = (end - start) >> HPAGE_SHIFT; | 74 | unsigned long hugepages = (end - start) >> HPAGE_SHIFT; |
| 75 | pgoff_t next = vma->vm_pgoff; | 75 | pgoff_t next = vma->vm_pgoff >> (HPAGE_SHIFT - PAGE_SHIFT); |
| 76 | pgoff_t endpg = next + ((end - start) >> PAGE_SHIFT); | 76 | pgoff_t endpg = next + hugepages; |
| 77 | 77 | ||
| 78 | pagevec_init(&pvec, 0); | 78 | pagevec_init(&pvec, 0); |
| 79 | while (next < endpg) { | 79 | while (next < endpg) { |