Received: by 2002:ac0:8845:0:0:0:0:0 with SMTP id g63csp375430img; Thu, 28 Feb 2019 00:38:02 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib0NjEOygDSXvJdFkfbWFsW/1I3qO4HenkCj6U0/MPXZatV9u9DEvstAzfJxB8tJN74rKCg X-Received: by 2002:a62:1b92:: with SMTP id b140mr6330988pfb.159.1551343082288; Thu, 28 Feb 2019 00:38:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551343082; cv=none; d=google.com; s=arc-20160816; b=vlfk5Ii0W8JeNqNA6SvJzzBwLNmu0ObhSuiJBMqMpKOcAQqpkOgi+JMC2G05BFSun9 66gsBHVeUDVKWYDwElW0uaq/YAPtZrTRm+RStnyWgwK+3ctwKvNmIC70FHAekHMUJjO4 wZXvWl8Q6Aao8/Y9Hch9ajIOknAAzW9yWvAI3gXAVO2a9wD2fozY4rkOAU6Krp+y7ylf Zi9j7I5ds9cDC1PTC/fsaiJT6mMWhnwz/Qg5s3RN8Wvc6U0pHnatkiL8T4t4d+XP56OA QtvN16bbqRYI3KKBqbpHi8W74lpV4T39Fma2Amj5u0Uc3sEKx2QgiQ49IxkYiWJfHMkh lYVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=OF/MFn2RYZUqEg593eJ/PysigzeOI7gs8bHHT/DLPHw=; b=0Bx8KwA/2CBLFCEInw2Hqjs+V00KuZbl4f3oiR8ot7QliYTWFbvPaU3mIbHPWmK/qI jcjg6aDT2VE/ujoYQ1ftN1LD701bZ2fEU9RUFOsgA2hDb5ARsO5eOD/3RfH+8CocZf1o jjhVctose5OP3+/bEj+d0tJuvHd0zTR+gaWg9Ad7oHxaMOVVwuIUB3aMnEm8ul3ki1zs 3s1+uhqE68vMuSIckdly6G/E0iQI9wETjxrCxE+A9bxjS+QGxvrWMXClIolh61vLbGUp aKkIPH3CyoHvfun9AGjd++rg6X2cnJ65/ndrGLSnfUibCM3Vo34505+AnOOoRK6brFm1 IQ1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v10si7368323plg.347.2019.02.28.00.37.47; Thu, 28 Feb 2019 00:38:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731939AbfB1Ify (ORCPT + 99 others); Thu, 28 Feb 2019 03:35:54 -0500 Received: from relay.sw.ru ([185.231.240.75]:57914 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731829AbfB1Ift (ORCPT ); Thu, 28 Feb 2019 03:35:49 -0500 Received: from [172.16.25.12] (helo=i7.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gzHAK-0008R2-BB; Thu, 28 Feb 2019 11:35:40 +0300 From: Andrey Ryabinin To: Andrew Morton Cc: Johannes Weiner , Vlastimil Babka , Rik van Riel , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Ryabinin , Michal Hocko , Mel Gorman Subject: [PATCH v2 4/4] mm/vmscan: remove unused lru_pages argument Date: Thu, 28 Feb 2019 11:33:29 +0300 Message-Id: <20190228083329.31892-4-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190228083329.31892-1-aryabinin@virtuozzo.com> References: <20190228083329.31892-1-aryabinin@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit 9092c71bb724 ("mm: use sc->priority for slab shrink targets") the argument 'unsigned long *lru_pages' passed around with no purpose. Remove it. Signed-off-by: Andrey Ryabinin Acked-by: Johannes Weiner Acked-by: Vlastimil Babka Cc: Michal Hocko Cc: Rik van Riel Cc: Mel Gorman --- Changes since v1: - Changelog update - Added acks mm/vmscan.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 2d081a32c6a8..07f74e9507b6 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2257,8 +2257,7 @@ enum scan_balance { * nr[2] = file inactive pages to scan; nr[3] = file active pages to scan */ static void get_scan_count(struct lruvec *lruvec, struct mem_cgroup *memcg, - struct scan_control *sc, unsigned long *nr, - unsigned long *lru_pages) + struct scan_control *sc, unsigned long *nr) { int swappiness = mem_cgroup_swappiness(memcg); struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat; @@ -2409,7 +2408,6 @@ static void get_scan_count(struct lruvec *lruvec, struct mem_cgroup *memcg, fraction[1] = fp; denominator = ap + fp + 1; out: - *lru_pages = 0; for_each_evictable_lru(lru) { int file = is_file_lru(lru); unsigned long lruvec_size; @@ -2525,7 +2523,6 @@ static void get_scan_count(struct lruvec *lruvec, struct mem_cgroup *memcg, BUG(); } - *lru_pages += lruvec_size; nr[lru] = scan; } } @@ -2534,7 +2531,7 @@ static void get_scan_count(struct lruvec *lruvec, struct mem_cgroup *memcg, * This is a basic per-node page freer. Used by both kswapd and direct reclaim. */ static void shrink_node_memcg(struct pglist_data *pgdat, struct mem_cgroup *memcg, - struct scan_control *sc, unsigned long *lru_pages) + struct scan_control *sc) { struct lruvec *lruvec = mem_cgroup_lruvec(pgdat, memcg); unsigned long nr[NR_LRU_LISTS]; @@ -2546,7 +2543,7 @@ static void shrink_node_memcg(struct pglist_data *pgdat, struct mem_cgroup *memc struct blk_plug plug; bool scan_adjusted; - get_scan_count(lruvec, memcg, sc, nr, lru_pages); + get_scan_count(lruvec, memcg, sc, nr); /* Record the original scan target for proportional adjustments later */ memcpy(targets, nr, sizeof(nr)); @@ -2751,7 +2748,6 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) .pgdat = pgdat, .priority = sc->priority, }; - unsigned long node_lru_pages = 0; struct mem_cgroup *memcg; memset(&sc->nr, 0, sizeof(sc->nr)); @@ -2761,7 +2757,6 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) memcg = mem_cgroup_iter(root, NULL, &reclaim); do { - unsigned long lru_pages; unsigned long reclaimed; unsigned long scanned; @@ -2798,8 +2793,7 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) reclaimed = sc->nr_reclaimed; scanned = sc->nr_scanned; - shrink_node_memcg(pgdat, memcg, sc, &lru_pages); - node_lru_pages += lru_pages; + shrink_node_memcg(pgdat, memcg, sc); if (sc->may_shrinkslab) { shrink_slab(sc->gfp_mask, pgdat->node_id, @@ -3332,7 +3326,6 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, .may_swap = !noswap, .may_shrinkslab = 1, }; - unsigned long lru_pages; sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) | (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK); @@ -3349,7 +3342,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, * will pick up pages from other mem cgroup's as well. We hack * the priority and make it zero. */ - shrink_node_memcg(pgdat, memcg, &sc, &lru_pages); + shrink_node_memcg(pgdat, memcg, &sc); trace_mm_vmscan_memcg_softlimit_reclaim_end(sc.nr_reclaimed); -- 2.19.2