---

yaml --- r: 343349 b: refs/heads/master c: 66521d5 h: refs/heads/master i: 343347: 03cc566 v: v3
git-mirror · Dec 13, 2012 · 1a1efb8 · 1a1efb8
1 parent 2b74848
commit 1a1efb8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 816422ad76474fed8052b6f7b905a054d082e59a
+refs/heads/master: 66521d5aa6c0f74b5e90c21569acbaa8c5ac0998
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -2780,13 +2780,8 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
 oom_free_new:
 	page_cache_release(new_page);
 oom:
-	if (old_page) {
-		if (page_mkwrite) {
-			unlock_page(old_page);
-			page_cache_release(old_page);
-		}
+	if (old_page)
 		page_cache_release(old_page);
-	}
 	return VM_FAULT_OOM;
 
 unwritable_page: