From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754246AbYE3Q7a (ORCPT ); Fri, 30 May 2008 12:59:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753118AbYE3Q7M (ORCPT ); Fri, 30 May 2008 12:59:12 -0400 Received: from hellhawk.shadowen.org ([80.68.90.175]:4995 "EHLO hellhawk.shadowen.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753024AbYE3Q7K (ORCPT ); Fri, 30 May 2008 12:59:10 -0400 From: Andy Whitcroft To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, agl@us.ibm.com, wli@holomorphy.com, kenchen@google.com, dwg@au1.ibm.com, andi@firstfloor.org, Mel Gorman , dean@arctic.org, abh@cray.com, Andy Whitcroft Subject: [PATCH 2/2] huge page MAP_NORESERVE review cleanups References: InReply-To: Date: Fri, 30 May 2008 17:58:39 +0100 Message-Id: <1212166719.0@pinky> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the new encapsulated huge page offset helper. Signed-off-by: Andy Whitcroft --- 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); } }