From: Johannes Weiner Date: Wed, 6 Aug 2014 23:08:16 +0000 (-0700) Subject: mm: memcontrol: clean up reclaim size variable use in try_charge() X-Git-Tag: cleanup-for-v3.18~96^2~90 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61e02c745721a361ba238e70bfa1c84a4df1a4b7;p=pandora-kernel.git 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 Cc: Michal Hocko Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed