From: Dominik Dingel <dingel@linux.vnet.ibm.com>
Date: Wed, 12 Dec 2012 21:52:37 +0000 (-0800)
Subject: mm/memory.c: remove unused code from do_wp_page()
X-Git-Tag: v3.8-rc1~127^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66521d5aa6c0f74b5e90c21569acbaa8c5ac0998;p=profile%2Fivi%2Fkernel-x86-ivi.git

mm/memory.c: remove unused code from do_wp_page()

page_mkwrite is initalized with zero and only set once, from that point
exists no way to get to the oom or oom_free_new labels.

[akpm@linux-foundation.org: cleanup]
Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/memory.c b/mm/memory.c
index 3f680e7..db2e9e7 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2780,13 +2780,8 @@ unlock:
 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: