Staging
v0.8.1
https://github.com/torvalds/linux
Revision 61469f1d51777fc3b6d8d70da8373ee77ee13349 authored by Hugh Dickins on 04 March 2008, 22:29:04 UTC, committed by Linus Torvalds on 05 March 2008, 00:35:14 UTC
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>
1 parent 6dbf6d3
History
Tip revision: 61469f1d51777fc3b6d8d70da8373ee77ee13349 authored by Hugh Dickins on 04 March 2008, 22:29:04 UTC
memcg: when do_swap's do_wp_page fails
Tip revision: 61469f1
File Mode Size
Kconfig -rw-r--r-- 2.0 KB
Kconfig.iosched -rw-r--r-- 1.9 KB
Makefile -rw-r--r-- 530 bytes
as-iosched.c -rw-r--r-- 38.1 KB
blk-barrier.c -rw-r--r-- 7.7 KB
blk-core.c -rw-r--r-- 53.8 KB
blk-exec.c -rw-r--r-- 2.6 KB
blk-ioc.c -rw-r--r-- 4.0 KB
blk-map.c -rw-r--r-- 7.1 KB
blk-merge.c -rw-r--r-- 12.1 KB
blk-settings.c -rw-r--r-- 13.1 KB
blk-sysfs.c -rw-r--r-- 7.6 KB
blk-tag.c -rw-r--r-- 9.5 KB
blk.h -rw-r--r-- 1.7 KB
blktrace.c -rw-r--r-- 11.4 KB
bsg.c -rw-r--r-- 22.4 KB
cfq-iosched.c -rw-r--r-- 53.9 KB
compat_ioctl.c -rw-r--r-- 22.0 KB
deadline-iosched.c -rw-r--r-- 11.5 KB
elevator.c -rw-r--r-- 25.9 KB
genhd.c -rw-r--r-- 17.8 KB
ioctl.c -rw-r--r-- 7.0 KB
noop-iosched.c -rw-r--r-- 2.6 KB
scsi_ioctl.c -rw-r--r-- 16.9 KB

back to top