1 files changed, 10 insertions, 2 deletions

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 095f94c2d8b5..e5099f268032 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -1873,6 +1873,7 @@ xfs_vm_set_page_dirty(
         loff_t                  end_offset;
         loff_t                  offset;
         int                     newly_dirty;
+        struct mem_cgroup       *memcg;
 
         if (unlikely(!mapping))
                 return !TestSetPageDirty(page);
@@ -1892,6 +1893,11 @@ xfs_vm_set_page_dirty(
                         offset += 1 << inode->i_blkbits;
                 } while (bh != head);
         }
+        /*
+         * Use mem_group_begin_page_stat() to keep PageDirty synchronized with
+         * per-memcg dirty page counters.
+         */
+        memcg = mem_cgroup_begin_page_stat(page);
         newly_dirty = !TestSetPageDirty(page);
         spin_unlock(&mapping->private_lock);
 
@@ -1902,13 +1908,15 @@ xfs_vm_set_page_dirty(
                 spin_lock_irqsave(&mapping->tree_lock, flags);
                 if (page->mapping) {    /* Race with truncate? */
                         WARN_ON_ONCE(!PageUptodate(page));
-                        account_page_dirtied(page, mapping);
+                        account_page_dirtied(page, mapping, memcg);
                         radix_tree_tag_set(&mapping->page_tree,
                                         page_index(page), PAGECACHE_TAG_DIRTY);
                 }
                 spin_unlock_irqrestore(&mapping->tree_lock, flags);
-                __mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
         }
+        mem_cgroup_end_page_stat(memcg);
+        if (newly_dirty)
+                __mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
         return newly_dirty;
 }