Re: [patch 05/19] Use page_cache_xxx in mm/rmap.c

[David Chinner <dgc@sgi.com>]

On Wed, Nov 28, 2007 at 07:30:54PM -0800, Christoph Lameter wrote:
> On Thu, 29 Nov 2007, David Chinner wrote:
> 
> > >  	unsigned int mapcount;
> > >  	struct address_space *mapping = page->mapping;
> > > -	pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
> > > +	pgoff_t pgoff = page->index << (page_cache_shift(mapping) - PAGE_SHIFT);
> > 
> > Based on the first hunk, shouldn't this be:
> > 
> > 	pgoff_t pgoff = page->index << mapping_order(mapping);
> 
> Yes that is much simpler
> 
> 
> rmap: simplify page_referenced_file use of page cache inlines
> 
> Signed-off-by: Christoph Lameter <clameter@sgi.com>
> 
> ---
>  mm/rmap.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: mm/mm/rmap.c
> ===================================================================
> --- mm.orig/mm/rmap.c	2007-11-28 19:28:45.689883608 -0800
> +++ mm/mm/rmap.c	2007-11-28 19:29:35.090382690 -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;

And the other two occurrences of this in the first patch?

Cheers,

Dave.
-- 
Dave Chinner
Principal Engineer
SGI Australian Software Group