From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752791Ab2BOQ2n (ORCPT ); Wed, 15 Feb 2012 11:28:43 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:37507 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752729Ab2BOQ2i (ORCPT ); Wed, 15 Feb 2012 11:28:38 -0500 Subject: [PATCH 2/2] memcg: use vm_swappiness from current memcg To: linux-mm@kvack.org, Andrew Morton , KAMEZAWA Hiroyuki , Johannes Weiner From: Konstantin Khlebnikov Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 15 Feb 2012 20:28:34 +0400 Message-ID: <20120215162834.13902.37262.stgit@zurg> In-Reply-To: <20120215162830.13902.60256.stgit@zurg> References: <20120215162830.13902.60256.stgit@zurg> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At this point this is always the same cgroup, but it allows to drop one argument. Signed-off-by: Konstantin Khlebnikov --- mm/vmscan.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index b069fac..751fab3 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1899,12 +1899,11 @@ static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan, return shrink_inactive_list(nr_to_scan, mz, sc, priority, file); } -static int vmscan_swappiness(struct mem_cgroup_zone *mz, - struct scan_control *sc) +static int vmscan_swappiness(struct scan_control *sc) { if (global_reclaim(sc)) return vm_swappiness; - return mem_cgroup_swappiness(mz->mem_cgroup); + return mem_cgroup_swappiness(sc->current_mem_cgroup); } /* @@ -1972,8 +1971,8 @@ static void get_scan_count(struct mem_cgroup_zone *mz, struct scan_control *sc, * With swappiness at 100, anonymous and file have the same priority. * This scanning priority is essentially the inverse of IO cost. */ - anon_prio = vmscan_swappiness(mz, sc); - file_prio = 200 - vmscan_swappiness(mz, sc); + anon_prio = vmscan_swappiness(sc); + file_prio = 200 - vmscan_swappiness(sc); /* * OK, so we have swap space and a fair amount of page cache