From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754271Ab2BTX2r (ORCPT ); Mon, 20 Feb 2012 18:28:47 -0500 Received: from mail-pz0-f46.google.com ([209.85.210.46]:60110 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753851Ab2BTX2q (ORCPT ); Mon, 20 Feb 2012 18:28:46 -0500 Authentication-Results: mr.google.com; spf=pass (google.com: domain of hughd@google.com designates 10.68.211.131 as permitted sender) smtp.mail=hughd@google.com; dkim=pass header.i=hughd@google.com Date: Mon, 20 Feb 2012 15:28:21 -0800 (PST) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Andrew Morton cc: Konstantin Khlebnikov , KAMEZAWA Hiroyuki , Johannes Weiner , Ying Han , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/10] mm/memcg: scanning_global_lru means mem_cgroup_disabled In-Reply-To: Message-ID: References: User-Agent: Alpine 2.00 (LSU 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Although one has to admire the skill with which it has been concealed, scanning_global_lru(mz) is actually just an interesting way to test mem_cgroup_disabled(). Too many developer hours have been wasted on confusing it with global_reclaim(): just use mem_cgroup_disabled(). Signed-off-by: Hugh Dickins --- mm/vmscan.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) --- mmotm.orig/mm/vmscan.c 2012-02-18 11:56:23.815522718 -0800 +++ mmotm/mm/vmscan.c 2012-02-18 11:56:33.395522945 -0800 @@ -164,26 +164,16 @@ static bool global_reclaim(struct scan_c { return !sc->target_mem_cgroup; } - -static bool scanning_global_lru(struct mem_cgroup_zone *mz) -{ - return !mz->mem_cgroup; -} #else static bool global_reclaim(struct scan_control *sc) { return true; } - -static bool scanning_global_lru(struct mem_cgroup_zone *mz) -{ - return true; -} #endif static struct zone_reclaim_stat *get_reclaim_stat(struct mem_cgroup_zone *mz) { - if (!scanning_global_lru(mz)) + if (!mem_cgroup_disabled()) return mem_cgroup_get_reclaim_stat(mz->mem_cgroup, mz->zone); return &mz->zone->reclaim_stat; @@ -192,7 +182,7 @@ static struct zone_reclaim_stat *get_rec static unsigned long zone_nr_lru_pages(struct mem_cgroup_zone *mz, enum lru_list lru) { - if (!scanning_global_lru(mz)) + if (!mem_cgroup_disabled()) return mem_cgroup_zone_nr_lru_pages(mz->mem_cgroup, zone_to_nid(mz->zone), zone_idx(mz->zone), @@ -1804,7 +1794,7 @@ static int inactive_anon_is_low(struct m if (!total_swap_pages) return 0; - if (!scanning_global_lru(mz)) + if (!mem_cgroup_disabled()) return mem_cgroup_inactive_anon_is_low(mz->mem_cgroup, mz->zone); @@ -1843,7 +1833,7 @@ static int inactive_file_is_low_global(s */ static int inactive_file_is_low(struct mem_cgroup_zone *mz) { - if (!scanning_global_lru(mz)) + if (!mem_cgroup_disabled()) return mem_cgroup_inactive_file_is_low(mz->mem_cgroup, mz->zone);