diff --git a/[refs] b/[refs] index b8e37f9e7091..0c30f27a8ed3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c08540f8755c451d8b96ea14cfe796bc3cd712d +refs/heads/master: 55e829af06681e5d731c03ba04febbd1c76ca293 diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c index 865570fe0d39..904d59d1eb8e 100644 --- a/trunk/fs/buffer.c +++ b/trunk/fs/buffer.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -729,8 +730,10 @@ int __set_page_dirty_buffers(struct page *page) write_lock_irq(&mapping->tree_lock); if (page->mapping) { /* Race with truncate? */ - if (mapping_cap_account_dirty(mapping)) + if (mapping_cap_account_dirty(mapping)) { __inc_zone_page_state(page, NR_FILE_DIRTY); + task_io_account_write(PAGE_CACHE_SIZE); + } radix_tree_tag_set(&mapping->page_tree, page_index(page), PAGECACHE_TAG_DIRTY); } diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c index 59ffcdbde8b3..237107c1b084 100644 --- a/trunk/mm/page-writeback.c +++ b/trunk/mm/page-writeback.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -768,8 +769,10 @@ int __set_page_dirty_nobuffers(struct page *page) mapping2 = page_mapping(page); if (mapping2) { /* Race with truncate? */ BUG_ON(mapping2 != mapping); - if (mapping_cap_account_dirty(mapping)) + if (mapping_cap_account_dirty(mapping)) { __inc_zone_page_state(page, NR_FILE_DIRTY); + task_io_account_write(PAGE_CACHE_SIZE); + } radix_tree_tag_set(&mapping->page_tree, page_index(page), PAGECACHE_TAG_DIRTY); }