On 04/12/2012 08:24 AM, KAMEZAWA Hiroyuki wrote:
> Only one call passes 'true'. remove it and handle it in caller.
>
> Signed-off-by: KAMEZAWA Hiroyuki<kamezawa.hiroyu@xxxxxxxxxxxxxx>
I like the change. I won't ack the patch itself, though, because it has
a dependency with the "need_cancel" thing you introduced in your last
patch - that I need to think a bit more.
> ---
> mm/memcontrol.c | 29 ++++++++++++-----------------
> 1 files changed, 12 insertions(+), 17 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 8246418..9ac7984 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -2576,23 +2576,19 @@ void mem_cgroup_split_huge_fixup(struct page *head)
> * @pc: page_cgroup of the page.
> * @from: mem_cgroup which the page is moved from.
> * @to: mem_cgroup which the page is moved to. @from != @to.
> - * @uncharge: whether we should call uncharge and css_put against @from.
> *
> * The caller must confirm following.
> * - page is not on LRU (isolate_page() is useful.)
> * - compound_lock is held when nr_pages> 1
> *
> - * This function doesn't do "charge" nor css_get to new cgroup. It should be
> - * done by a caller(__mem_cgroup_try_charge would be useful). If @uncharge is
> - * true, this function does "uncharge" from old cgroup, but it doesn't if
> - * @uncharge is false, so a caller should do "uncharge".
> + * This function doesn't access res_counter at all. Caller should take
> + * care of it.
> */
> static int mem_cgroup_move_account(struct page *page,
> unsigned int nr_pages,
> struct page_cgroup *pc,
> struct mem_cgroup *from,
> - struct mem_cgroup *to,
> - bool uncharge)
> + struct mem_cgroup *to)
> {
> unsigned long flags;
> int ret;
> @@ -2626,9 +2622,6 @@ static int mem_cgroup_move_account(struct page *page,
> preempt_enable();
> }
> mem_cgroup_charge_statistics(from, anon, -nr_pages);
> - if (uncharge)
> - /* This is not "cancel", but cancel_charge does all we need. */
> - __mem_cgroup_cancel_charge(from, nr_pages);
>
> /* caller should have done css_get */
> pc->mem_cgroup = to;
> @@ -2688,10 +2681,13 @@ static int mem_cgroup_move_parent(struct page *page,
> if (nr_pages> 1)
> flags = compound_lock_irqsave(page);
>
> - ret = mem_cgroup_move_account(page, nr_pages, pc, child, parent,
> - need_cancel);
> - if (!need_cancel&& !ret)
> - __mem_cgroup_move_charge_parent(child, nr_pages);
> + ret = mem_cgroup_move_account(page, nr_pages, pc, child, parent);
> + if (!ret) {
> + if (need_cancel)
> + __mem_cgroup_cancel_charge(child, nr_pages);
> + else
> + __mem_cgroup_move_charge_parent(child, nr_pages);
> + }
>
> if (nr_pages> 1)
> compound_unlock_irqrestore(page, flags);
> @@ -5451,8 +5447,7 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd,
> if (!isolate_lru_page(page)) {
> pc = lookup_page_cgroup(page);
> if (!mem_cgroup_move_account(page, HPAGE_PMD_NR,
> - pc, mc.from, mc.to,
> - false)) {
> + pc, mc.from, mc.to)) {
> mc.precharge -= HPAGE_PMD_NR;
> mc.moved_charge += HPAGE_PMD_NR;
> }
> @@ -5482,7 +5477,7 @@ retry:
> goto put;
> pc = lookup_page_cgroup(page);
> if (!mem_cgroup_move_account(page, 1, pc,
> - mc.from, mc.to, false)) {
> + mc.from, mc.to)) {
> mc.precharge--;
> /* we uncharge from mc.from later. */
> mc.moved_charge++;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>