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 <clameter@xxxxxxx> --- 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; - To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html