1 files changed, 6 insertions, 5 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 0faacfe18909..da8547830098 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -109,7 +109,7 @@ struct writeback_state
 
 static void get_writeback_state(struct writeback_state *wbs)
 {
-        wbs->nr_dirty = read_page_state(nr_dirty);
+        wbs->nr_dirty = global_page_state(NR_FILE_DIRTY);
         wbs->nr_unstable = read_page_state(nr_unstable);
         wbs->nr_mapped = global_page_state(NR_FILE_MAPPED) +
                                 global_page_state(NR_ANON_PAGES);
@@ -641,7 +641,8 @@ int __set_page_dirty_nobuffers(struct page *page)
                         if (mapping2) { /* Race with truncate? */
                                 BUG_ON(mapping2 != mapping);
                                 if (mapping_cap_account_dirty(mapping))
-                                        inc_page_state(nr_dirty);
+                                        __inc_zone_page_state(page,
+                                                                NR_FILE_DIRTY);
                                 radix_tree_tag_set(&mapping->page_tree,
                                         page_index(page), PAGECACHE_TAG_DIRTY);
                         }
@@ -728,9 +729,9 @@ int test_clear_page_dirty(struct page *page)
                         radix_tree_tag_clear(&mapping->page_tree,
                                                 page_index(page),
                                                 PAGECACHE_TAG_DIRTY);
-                        write_unlock_irqrestore(&mapping->tree_lock, flags);
                         if (mapping_cap_account_dirty(mapping))
-                                dec_page_state(nr_dirty);
+                                __dec_zone_page_state(page, NR_FILE_DIRTY);
+                        write_unlock_irqrestore(&mapping->tree_lock, flags);
                         return 1;
                 }
                 write_unlock_irqrestore(&mapping->tree_lock, flags);
@@ -761,7 +762,7 @@ int clear_page_dirty_for_io(struct page *page)
         if (mapping) {
                 if (TestClearPageDirty(page)) {
                         if (mapping_cap_account_dirty(mapping))
-                                dec_page_state(nr_dirty);
+                                dec_zone_page_state(page, NR_FILE_DIRTY);
                         return 1;
                 }
                 return 0;