On Fri, Nov 30, 2007 at 09:34:55AM -0800, Christoph Lameter wrote: > Use page_cache_xxx in mm/migrate.c > > Reviewed-by: Dave Chinner <dgc@xxxxxxx> > Signed-off-by: Christoph Lameter <clameter@xxxxxxx> > --- > mm/migrate.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Index: mm/mm/migrate.c > =================================================================== > --- mm.orig/mm/migrate.c 2007-11-28 12:27:32.184464256 -0800 > +++ mm/mm/migrate.c 2007-11-28 14:10:49.200977227 -0800 > @@ -197,7 +197,7 @@ static void remove_file_migration_ptes(s > struct vm_area_struct *vma; > struct address_space *mapping = page_mapping(new); > struct prio_tree_iter iter; > - pgoff_t pgoff = new->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); > + pgoff_t pgoff = new->index << mapping_order(mapping); > > if (!mapping) > return; Mapping could be NULL, therefore the setting of pgoff needs to occur after the !mapping check. Cheers, Dave. -- Dave Chinner Principal Engineer SGI Australian Software Group - 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
