diff --git a/[refs] b/[refs] index 684cd80e3a8b..223763394fce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48f170fb7d7db8789ccc23e051af61f62af5f685 +refs/heads/master: 99b12e3d882bc7ebdfe0de381dff3b16d21c38f7 diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c index 919b45eb57ad..d8767b381b9c 100644 --- a/trunk/mm/page-writeback.c +++ b/trunk/mm/page-writeback.c @@ -1141,7 +1141,6 @@ EXPORT_SYMBOL(account_page_dirtied); void account_page_writeback(struct page *page) { inc_zone_page_state(page, NR_WRITEBACK); - inc_zone_page_state(page, NR_WRITTEN); } EXPORT_SYMBOL(account_page_writeback); @@ -1358,8 +1357,10 @@ int test_clear_page_writeback(struct page *page) } else { ret = TestClearPageWriteback(page); } - if (ret) + if (ret) { dec_zone_page_state(page, NR_WRITEBACK); + inc_zone_page_state(page, NR_WRITTEN); + } return ret; }