From a154bb89e6c700b03e2ddcb427063f849a293ae4 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Tue, 4 Mar 2008 14:29:04 -0800
Subject: [PATCH] --- yaml --- r: 86816 b: refs/heads/master c:
 61469f1d51777fc3b6d8d70da8373ee77ee13349 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9b8b3683cff3..c936c537a495 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dbf6d3bb955d5a92005b6ecd6ffad2c5b95b963
+refs/heads/master: 61469f1d51777fc3b6d8d70da8373ee77ee13349
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 7f8c03ec587c..0d14d1e58a5f 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -2093,12 +2093,9 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	unlock_page(page);
 
 	if (write_access) {
-		/* XXX: We could OR the do_wp_page code with this one? */
-		if (do_wp_page(mm, vma, address,
-				page_table, pmd, ptl, pte) & VM_FAULT_OOM) {
-			mem_cgroup_uncharge_page(page);
-			ret = VM_FAULT_OOM;
-		}
+		ret |= do_wp_page(mm, vma, address, page_table, pmd, ptl, pte);
+		if (ret & VM_FAULT_ERROR)
+			ret &= VM_FAULT_ERROR;
 		goto out;
 	}