From 5c2325868251d0fbaa1546bb93e4d01c9a409cec Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Fri, 25 Feb 2011 14:44:29 -0800
Subject: [PATCH] --- yaml --- r: 233702 b: refs/heads/master c:
 e5598f8bf5449bc09e4005600ead32e6f2a3e79b h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/mm/truncate.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d0c5291e68db..a1f00fe71f7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8eac563c1c3a2047083022357ae63722b19e4e08
+refs/heads/master: e5598f8bf5449bc09e4005600ead32e6f2a3e79b
diff --git a/trunk/mm/truncate.c b/trunk/mm/truncate.c
index 49feb46e77b8..d64296be00d3 100644
--- a/trunk/mm/truncate.c
+++ b/trunk/mm/truncate.c
@@ -225,6 +225,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
 	next = start;
 	while (next <= end &&
 	       pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
+		mem_cgroup_uncharge_start();
 		for (i = 0; i < pagevec_count(&pvec); i++) {
 			struct page *page = pvec.pages[i];
 			pgoff_t page_index = page->index;
@@ -247,6 +248,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
 			unlock_page(page);
 		}
 		pagevec_release(&pvec);
+		mem_cgroup_uncharge_end();
 		cond_resched();
 	}