[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1212166719.0@pinky>
Date: Fri, 30 May 2008 17:58:39 +0100
From: Andy Whitcroft <apw@...dowen.org>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-mm@...ck.org, linux-kernel@...r.kernel.org, agl@...ibm.com,
wli@...omorphy.com, kenchen@...gle.com, dwg@....ibm.com,
andi@...stfloor.org, Mel Gorman <mel@....ul.ie>, dean@...tic.org,
abh@...y.com, Andy Whitcroft <apw@...dowen.org>
Subject: [PATCH 2/2] huge page MAP_NORESERVE review cleanups
Use the new encapsulated huge page offset helper.
Signed-off-by: Andy Whitcroft <apw@...dowen.org>
---
mm/hugetlb.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 1dce03a..901e580 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -733,8 +733,7 @@ static int vma_needs_reservation(struct vm_area_struct *vma, unsigned long addr)
struct inode *inode = mapping->host;
if (vma->vm_flags & VM_SHARED) {
- unsigned long idx = ((addr - vma->vm_start) >> HPAGE_SHIFT) +
- (vma->vm_pgoff >> (HPAGE_SHIFT - PAGE_SHIFT));
+ pgoff_t idx = vma_pagecache_offset(vma, addr);
return region_chg(&inode->i_mapping->private_list,
idx, idx + 1);
@@ -752,8 +751,7 @@ static void vma_commit_reservation(struct vm_area_struct *vma,
struct inode *inode = mapping->host;
if (vma->vm_flags & VM_SHARED) {
- unsigned long idx = ((addr - vma->vm_start) >> HPAGE_SHIFT) +
- (vma->vm_pgoff >> (HPAGE_SHIFT - PAGE_SHIFT));
+ pgoff_t idx = vma_pagecache_offset(vma, addr);
region_add(&inode->i_mapping->private_list, idx, idx + 1);
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists