From: Christoph Lameter Use page_cache_xxx in mm/page-writeback.c Reviewed-by: Dave Chinner Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton --- mm/page-writeback.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN mm/page-writeback.c~use-page_cache_xxx-in-mm-page-writebackc mm/page-writeback.c --- a/mm/page-writeback.c~use-page_cache_xxx-in-mm-page-writebackc +++ a/mm/page-writeback.c @@ -818,8 +818,8 @@ int write_cache_pages(struct address_spa index = mapping->writeback_index; /* Start from prev offset */ end = -1; } else { - index = wbc->range_start >> PAGE_CACHE_SHIFT; - end = wbc->range_end >> PAGE_CACHE_SHIFT; + index = page_cache_index(mapping, wbc->range_start); + end = page_cache_index(mapping, wbc->range_end); if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) range_whole = 1; scanned = 1; @@ -1025,7 +1025,7 @@ int __set_page_dirty_nobuffers(struct pa __inc_zone_page_state(page, NR_FILE_DIRTY); __inc_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE); - task_io_account_write(PAGE_CACHE_SIZE); + task_io_account_write(page_cache_size(mapping)); } radix_tree_tag_set(&mapping->page_tree, page_index(page), PAGECACHE_TAG_DIRTY); _