Received: by 2002:ac0:8845:0:0:0:0:0 with SMTP id g63csp376802img; Thu, 28 Feb 2019 00:40:09 -0800 (PST) X-Google-Smtp-Source: AHgI3IZCHzx9l4aGfFE2AlTnOfT+3SxUk/mgvmTCVEdo60MD74+K4dCKGu/GL1aGXg2NREkKnmtD X-Received: by 2002:a63:6cc1:: with SMTP id h184mr7409641pgc.151.1551343209672; Thu, 28 Feb 2019 00:40:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551343209; cv=none; d=google.com; s=arc-20160816; b=sRCfCuguNRVoiIyE89BcD4pXcIIxEIwPvbjq6cSkhrdG3/QXa88YeZeAuWYzC6lv4Y GABYvyVmrQSprcwBiGmTayn8PX6YXkgu1ai91avNXSgXZmJRYku5E9xEamEF+6dGULAk yD5qbQKr6ZF3Asb0RGbXfmGyIqtlc75vTehq/F0KPJR/k8QGEJwfjy41UFC4vzNvLB7M AgiyczoaH8exWHrY/tzs5RQ+d/tTGRlR/xKSSmXreKoJtTOIsxa44lFY9F+ZQlMpAU60 ogw0vPm0JXsX66vw8R4Np4PgH15txSjdZxuhr5oKabNalDcLEYrShfceFRSRs0HVsop8 cCKQ== 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 :message-id:date:subject:cc:to:from; bh=85dsEaG52aLvrMnn+v8Ng9t2qY5ys0HWtclDH8znRHc=; b=GIW+d/QiBTs/F43lsAhEt47093SNomV69mWXHupYEQgLmCjKidBxFW6PqTsZKBAoGF E2tVT77mThFwVGN4jjguLZC+fqFJgM2Vw3/amoG3WVhaYfCAWUdkL4/OJ9NcNRQsJe+q D1e6N8DOPQfVRooe3sZOxmedJ2DUEbhVR5ED/FjO1ODX38TGMHZljXxfzwl0koupFAQ7 ysGOKrQJluj644Cxyzl2eCtblZTdWGjU/MiAUFRIF3se6OOV61ppJZ5SuZLs8B6xTRJ7 hIlRVqA7B1oTZHvvAiZwhSNpJLlphmo8bv1em2KHZo463ZiXbbERxJX6iiteGId2vJLc OO3Q== 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 g186si16271823pgc.586.2019.02.28.00.39.53; Thu, 28 Feb 2019 00:40:09 -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 S1731837AbfB1Ifu (ORCPT + 99 others); Thu, 28 Feb 2019 03:35:50 -0500 Received: from relay.sw.ru ([185.231.240.75]:57915 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731828AbfB1Ift (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 1gzHAJ-0008R2-PM; Thu, 28 Feb 2019 11:35:39 +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 1/4] mm/workingset: remove unused @mapping argument in workingset_eviction() Date: Thu, 28 Feb 2019 11:33:26 +0300 Message-Id: <20190228083329.31892-1-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.19.2 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 workingset_eviction() doesn't use and never did use the @mapping argument. Remove it. Signed-off-by: Andrey Ryabinin Acked-by: Johannes Weiner Acked-by: Rik van Riel Cc: Michal Hocko Cc: Vlastimil Babka Cc: Mel Gorman --- Changes since v1: - s/@mapping/@page->mapping in comment - Acks include/linux/swap.h | 2 +- mm/vmscan.c | 2 +- mm/workingset.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 649529be91f2..fc50e21b3b88 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -307,7 +307,7 @@ struct vma_swap_readahead { }; /* linux/mm/workingset.c */ -void *workingset_eviction(struct address_space *mapping, struct page *page); +void *workingset_eviction(struct page *page); void workingset_refault(struct page *page, void *shadow); void workingset_activation(struct page *page); diff --git a/mm/vmscan.c b/mm/vmscan.c index ac4806f0f332..a9852ed7b97f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -952,7 +952,7 @@ static int __remove_mapping(struct address_space *mapping, struct page *page, */ if (reclaimed && page_is_file_cache(page) && !mapping_exiting(mapping) && !dax_mapping(mapping)) - shadow = workingset_eviction(mapping, page); + shadow = workingset_eviction(page); __delete_from_page_cache(page, shadow); xa_unlock_irqrestore(&mapping->i_pages, flags); diff --git a/mm/workingset.c b/mm/workingset.c index dcb994f2acc2..0bedf67502d5 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -215,13 +215,12 @@ static void unpack_shadow(void *shadow, int *memcgidp, pg_data_t **pgdat, /** * workingset_eviction - note the eviction of a page from memory - * @mapping: address space the page was backing * @page: the page being evicted * - * Returns a shadow entry to be stored in @mapping->i_pages in place + * Returns a shadow entry to be stored in @page->mapping->i_pages in place * of the evicted @page so that a later refault can be detected. */ -void *workingset_eviction(struct address_space *mapping, struct page *page) +void *workingset_eviction(struct page *page) { struct pglist_data *pgdat = page_pgdat(page); struct mem_cgroup *memcg = page_memcg(page); -- 2.19.2