]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mm/memory.c: remove unused code from do_wp_page()
authorDominik Dingel <dingel@linux.vnet.ibm.com>
Wed, 12 Dec 2012 21:52:37 +0000 (13:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Dec 2012 01:38:35 +0000 (17:38 -0800)
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>
mm/memory.c

index 3f680e7c7645ed180650af9386951e1e7618942f..db2e9e797a05fc67684ef735ff5623b7151ad478 100644 (file)
@@ -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: