diff options
| author | Hugh Dickins <hugh@veritas.com> | 2008-03-04 14:29:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:35:14 -0800 |
| commit | 61469f1d51777fc3b6d8d70da8373ee77ee13349 (patch) | |
| tree | cdcde89af7b998c340414f305a2a723106770c17 /mm | |
| parent | 6dbf6d3bb955d5a92005b6ecd6ffad2c5b95b963 (diff) | |
| download | kernel_samsung_smdk4412-61469f1d51777fc3b6d8d70da8373ee77ee13349.zip kernel_samsung_smdk4412-61469f1d51777fc3b6d8d70da8373ee77ee13349.tar.gz kernel_samsung_smdk4412-61469f1d51777fc3b6d8d70da8373ee77ee13349.tar.bz2 | |
memcg: when do_swap's do_wp_page fails
Don't uncharge when do_swap_page's call to do_wp_page fails: the page which
was charged for is there in the pagetable, and will be correctly uncharged
when that area is unmapped - it was only its COWing which failed.
And while we're here, remove earlier XXX comment: yes, OR in do_wp_page's
return value (maybe VM_FAULT_WRITE) with do_swap_page's there; but if it
fails, mask out success bits, which might confuse some arches e.g. sparc.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: David Rientjes <rientjes@google.com>
Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hirokazu Takahashi <taka@valinux.co.jp>
Cc: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mm/memory.c b/mm/memory.c index 7f8c03e..0d14d1e 100644 --- a/mm/memory.c +++ b/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; } |