1 files changed, 4 insertions, 7 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 31f698862420..d8767b381b9c 100644
--- a/mm/page-writeback.c
+++ b/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;
 }
 
@@ -1405,10 +1406,6 @@ EXPORT_SYMBOL(test_set_page_writeback);
  */
 int mapping_tagged(struct address_space *mapping, int tag)
 {
-        int ret;
-        rcu_read_lock();
-        ret = radix_tree_tagged(&mapping->page_tree, tag);
-        rcu_read_unlock();
-        return ret;
+        return radix_tree_tagged(&mapping->page_tree, tag);
 }
 EXPORT_SYMBOL(mapping_tagged);