]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
mm: memcontrol: clean up reclaim size variable use in try_charge()
authorJohannes Weiner <hannes@cmpxchg.org>
Wed, 6 Aug 2014 23:08:16 +0000 (16:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Aug 2014 01:01:22 +0000 (18:01 -0700)
commit61e02c745721a361ba238e70bfa1c84a4df1a4b7
tree955aed6249a0dc68faa09bec44acbd68ffb5fbbe
parent618fde872163e782183ce574c77f1123e2be8887
mm: memcontrol: clean up reclaim size variable use in try_charge()

Charge reclaim and OOM currently use the charge batch variable, but
batching is already disabled at that point.  To simplify the charge
logic, the batch variable is reset to the original request size when
reclaim is entered, so it's functionally equal, but it's misleading.

Switch reclaim/OOM to nr_pages, which is the original request size.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/memcontrol.c