From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Lameter Subject: Re: [patch 05/19] Use page_cache_xxx in mm/rmap.c Date: Wed, 28 Nov 2007 20:09:39 -0800 (PST) Message-ID: References: <20071129011052.866354847@sgi.com> <20071129011145.414062339@sgi.com> <20071129031921.GS119954183@sgi.com> <20071129035955.GZ119954183@sgi.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: akpm@linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , Mel Gorman , William Lee Irwin III , Jens Axboe , Badari Pulavarty , Maxim Levitsky , Fengguang Wu , swin wang , totty.lu@gmail.com, hugh@veritas.com, joern@lazybastard.org To: David Chinner Return-path: Received: from netops-testserver-3-out.sgi.com ([192.48.171.28]:51862 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756661AbXK2EJk (ORCPT ); Wed, 28 Nov 2007 23:09:40 -0500 In-Reply-To: <20071129035955.GZ119954183@sgi.com> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org On Thu, 29 Nov 2007, David Chinner wrote: > And the other two occurrences of this in the first patch? Ahh... Ok they are also in rmap.c: rmap: simplify page_referenced_file use of page cache inlines Signed-off-by: Christoph Lameter --- mm/rmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: mm/mm/rmap.c =================================================================== --- mm.orig/mm/rmap.c 2007-11-28 20:03:15.255240262 -0800 +++ mm/mm/rmap.c 2007-11-28 20:08:50.278132294 -0800 @@ -350,7 +350,7 @@ static int page_referenced_file(struct p { unsigned int mapcount; struct address_space *mapping = page->mapping; - pgoff_t pgoff = page->index << (page_cache_shift(mapping) - PAGE_SHIFT); + pgoff_t pgoff = page->index << mapping_order(mapping); struct vm_area_struct *vma; struct prio_tree_iter iter; int referenced = 0; @@ -469,7 +469,7 @@ out: static int page_mkclean_file(struct address_space *mapping, struct page *page) { - pgoff_t pgoff = page->index << (page_cache_shift(mapping) - PAGE_SHIFT); + pgoff_t pgoff = page->index << mapping_order(mapping); struct vm_area_struct *vma; struct prio_tree_iter iter; int ret = 0; @@ -902,7 +902,7 @@ static int try_to_unmap_anon(struct page static int try_to_unmap_file(struct page *page, int migration) { struct address_space *mapping = page->mapping; - pgoff_t pgoff = page->index << (page_cache_shift(mapping) - PAGE_SHIFT); + pgoff_t pgoff = page->index << mapping_order(mapping); struct vm_area_struct *vma; struct prio_tree_iter iter; int ret = SWAP_AGAIN;