From 69494190b1e3857ec0ae91e0e590fe990671d94f Mon Sep 17 00:00:00 2001 From: Michael Rubin Date: Fri, 20 Aug 2010 02:31:26 -0700 Subject: [PATCH] --- yaml --- r: 210049 b: refs/heads/master c: 679ceace848e9fd570678396ffe1ef034e00e82d h: refs/heads/master i: 210047: 6461ab68d771903fd5ecc21c4df68102d022c3d5 v: v3 --- [refs] | 2 +- trunk/fs/ceph/addr.c | 8 +------- trunk/mm/page-writeback.c | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index a06f779c5094..3d2e99a32c7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb6bb1c5bdc6e455a9d16cb845cc65afc9b0a617 +refs/heads/master: 679ceace848e9fd570678396ffe1ef034e00e82d diff --git a/trunk/fs/ceph/addr.c b/trunk/fs/ceph/addr.c index 5598a0d02295..420d46974ec8 100644 --- a/trunk/fs/ceph/addr.c +++ b/trunk/fs/ceph/addr.c @@ -105,13 +105,7 @@ static int ceph_set_page_dirty(struct page *page) spin_lock_irq(&mapping->tree_lock); if (page->mapping) { /* Race with truncate? */ WARN_ON_ONCE(!PageUptodate(page)); - - if (mapping_cap_account_dirty(mapping)) { - __inc_zone_page_state(page, NR_FILE_DIRTY); - __inc_bdi_stat(mapping->backing_dev_info, - BDI_RECLAIMABLE); - task_io_account_write(PAGE_CACHE_SIZE); - } + account_page_dirtied(page, page->mapping); 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 37498ef61548..849d0ccbe914 100644 --- a/trunk/mm/page-writeback.c +++ b/trunk/mm/page-writeback.c @@ -1096,6 +1096,7 @@ void account_page_dirtied(struct page *page, struct address_space *mapping) task_io_account_write(PAGE_CACHE_SIZE); } } +EXPORT_SYMBOL(account_page_dirtied); /* * For address_spaces which do not use buffers. Just tag the page as dirty in