From f485e31647bfa47a76567d68882a02049db13fca Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Wed, 1 Feb 2006 03:05:31 -0800
Subject: [PATCH] --- yaml --- r: 19370 b: refs/heads/master c:
 4e6a510a74145585f4111d60d1b5fd450d795dd8 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/fs/hugetlbfs/inode.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b791026bc0f8..4a2048130664 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9884fd8df195fe48d4e1be2279b419be96127cae
+refs/heads/master: 4e6a510a74145585f4111d60d1b5fd450d795dd8
diff --git a/trunk/fs/hugetlbfs/inode.c b/trunk/fs/hugetlbfs/inode.c
index f568102da1e8..b35195289945 100644
--- a/trunk/fs/hugetlbfs/inode.c
+++ b/trunk/fs/hugetlbfs/inode.c
@@ -72,8 +72,8 @@ huge_pages_needed(struct address_space *mapping, struct vm_area_struct *vma)
 	unsigned long start = vma->vm_start;
 	unsigned long end = vma->vm_end;
 	unsigned long hugepages = (end - start) >> HPAGE_SHIFT;
-	pgoff_t next = vma->vm_pgoff;
-	pgoff_t endpg = next + ((end - start) >> PAGE_SHIFT);
+	pgoff_t next = vma->vm_pgoff >> (HPAGE_SHIFT - PAGE_SHIFT);
+	pgoff_t endpg = next + hugepages;
 
 	pagevec_init(&pvec, 0);
 	while (next < endpg) {