diff options
author | Dominik Dingel <dingel@linux.vnet.ibm.com> | 2012-12-12 16:52:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 20:38:35 -0500 |
commit | 66521d5aa6c0f74b5e90c21569acbaa8c5ac0998 (patch) | |
tree | d77ac5afdf31d18bcf4e47b14fc19df9a6618f9b /mm/memory.c | |
parent | 816422ad76474fed8052b6f7b905a054d082e59a (diff) |
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>
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mm/memory.c b/mm/memory.c index 3f680e7c7645..db2e9e797a05 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -2780,13 +2780,8 @@ unlock: | |||
2780 | oom_free_new: | 2780 | oom_free_new: |
2781 | page_cache_release(new_page); | 2781 | page_cache_release(new_page); |
2782 | oom: | 2782 | oom: |
2783 | if (old_page) { | 2783 | if (old_page) |
2784 | if (page_mkwrite) { | ||
2785 | unlock_page(old_page); | ||
2786 | page_cache_release(old_page); | ||
2787 | } | ||
2788 | page_cache_release(old_page); | 2784 | page_cache_release(old_page); |
2789 | } | ||
2790 | return VM_FAULT_OOM; | 2785 | return VM_FAULT_OOM; |
2791 | 2786 | ||
2792 | unwritable_page: | 2787 | unwritable_page: |