From patchwork Mon Apr 17 11:48:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13213709 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 449BEC77B70 for ; Mon, 17 Apr 2023 11:30:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B12708E0002; Mon, 17 Apr 2023 07:30:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AC2328E0001; Mon, 17 Apr 2023 07:30:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B1148E0002; Mon, 17 Apr 2023 07:30:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 8BCEF8E0001 for ; Mon, 17 Apr 2023 07:30:04 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 510B212055E for ; Mon, 17 Apr 2023 11:30:04 +0000 (UTC) X-FDA: 80690663928.15.7B2A5B4 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf12.hostedemail.com (Postfix) with ESMTP id 1B9B940020 for ; Mon, 17 Apr 2023 11:30:01 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf12.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681731002; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=W7nZ+tBex5q6sNcbWRdvrLSfF9YNokrdfM307G2SAQo=; b=pULg/tSWro8VQy9oTUeHfw8GMQTZlMNHMSnZ4TOsznFYR4kXKxVjEZBcdFmMo+HBjRP3I7 T1+VPAsvWIwuLpzTD061r3zM++05CsQNutR01gsXm8AeS+OryU7WpNce5nSYiJS7+GRQiP fL0qzRZnkgNhYIlaXZsCdSqn8byN0ag= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf12.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681731002; a=rsa-sha256; cv=none; b=Tk/SpRn4eKr+vghgPiycWl70t5SSd3iJZC+KvY/A5WdqmPwvInvp5ynlxVgtj6kEuupEMN 38k+XLumkOuTwE+F8ClTqE/PBIfzp5gdulIGWZn8Syte7QoTrhuLKBlCLnBwjIHf7RKlaV dSVoiSygM5JSfRJ+b9fulD1ZO7yllnI= Received: from dggpemm500001.china.huawei.com (unknown [7.185.36.107]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Q0PrT2nG6z17SgW; Mon, 17 Apr 2023 19:26:17 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 17 Apr 2023 19:29:57 +0800 From: Kefeng Wang To: Andrew Morton , , "Matthew Wilcox (Oracle)" CC: SeongJae Park , Hugh Dickins , , Kefeng Wang Subject: [PATCH] mm: correct arg in reclaim_pages()/reclaim_clean_pages_from_list() Date: Mon, 17 Apr 2023 19:48:07 +0800 Message-ID: <20230417114807.186786-1-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500001.china.huawei.com (7.185.36.107) X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 1B9B940020 X-Stat-Signature: 8ezeq3iqxgj84y53bfx3uuqwuw6gjyhj X-HE-Tag: 1681731001-812832 X-HE-Meta: U2FsdGVkX18MRBiHHgwFoDlbFaAwJy0jgS6klCFWqznugagwryavHG+p6WUddJWkREZ8aTKUEBsgvY2w2m5EPAJ10pTOMS6h2GKbLpwN4oAFW2i5TkLkQ5GhrNerZPf8Bv//0OWVRvBI9KaLKlKNgQvlI7zgARwjvXl6c/K9eyYgsi8HrxkqMCSjwmjCree8GaGYnrn9740PqkaBy10miJ/xsLE4m3Zg8oFonPYmp4L0ZiPMwXUACYSvB6/eRdLRjPVJ1LpsOKLPc7/FCPv841lwdzGpcdZoQdUdGiXJt9f+Qql964oXgGzQbdxUB2T964rclQMocGuBk7vWuX1+S/hA+p+LEH0kAWyCn8cZl/GgSWFUDGzMNlZ0u6xcTjN/1fAPOnZAx9/7zC8WYydEId9vf7t0x4uY4FdDBUFRsRcFl5/Mk+QQlrGYgahuIwgk3qab85Th8PZLPrbFH/Gx7sCWYyfwjVFs53U7xBLedXczwIwwDhWn6Zy6EbRDghRvqcLKBy/wW6cDxowRLNDzYIy58erJ6wdhDfexOhRJ8S9Q66FynyFUE/tg+rxjj75iC6h3or8A+SAgnNB44xoIPxRdepMQkZH3+Vzh/m5DSsW7u16DbfakMUelNNxgPfQuBXK3NQBZPppCiIz/8y9yPppZuUpzDRmWQpjqWDF5L/h4uMbl32UOJbNg2EM/Lp0YxkXBqpMy8N2czFjwVumXWCbEOsXDjrRs7h8WvW4zsXKJhuad1qY9eeFNOcqHUnKvY0oghAlqyUf6riv9cu7h9r45RX6V1A4RYCtRH1ZggDHKgUCEwWjeklZnlyvRJstRBQNmYm8qCtxJakB69LFtgW6S3kSrj4UXfL5AE0KUQCiOyyoIB2xGo/E0UY47UiFiVIGjz3E/DmtLgXphaqNxeAJ+p/Unf5Miq+e1TypA5NZGAW99Nd8hUrNm79//2IgIPnx4BbB45Dq2RGS3KZq hoN39Bwx doemXh/o3UQ8UdOGgd2XuXvMq/kAzJQ60s49yW+QqKOwh4LJMoKxX134izR9S3cYccowuKr70bGcooSqx7Dzdr8eL131hvq70UscXADPFT/Adh/XHSJr7/KbKMAs+4P0kV5xhqnOh4jqnc0QDOhbfO5M8TYfuKXC4DWolMAIFCP5JVdth63spfOpNz8xsC9jlLE0rjQxBwZWnxfI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Both of them change the arg from page_list to folio_list when convert them to use a folio, but not the declaration, let's correct it, also move the reclaim_pages() from swap.h to internal.h as it only used in mm. Signed-off-by: Kefeng Wang Reviewed-by: SeongJae Park Reviewed-by: David Hildenbrand --- include/linux/swap.h | 1 - mm/internal.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 7f7d5b9ddf7e..3c69cb653cb9 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -442,7 +442,6 @@ extern unsigned long shrink_all_memory(unsigned long nr_pages); extern int vm_swappiness; long remove_mapping(struct address_space *mapping, struct folio *folio); -extern unsigned long reclaim_pages(struct list_head *page_list); #ifdef CONFIG_NUMA extern int node_reclaim_mode; extern int sysctl_min_unmapped_ratio; diff --git a/mm/internal.h b/mm/internal.h index 286f97a5125c..f59093b8adb6 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -804,8 +804,9 @@ extern unsigned long __must_check vm_mmap_pgoff(struct file *, unsigned long, unsigned long, unsigned long); extern void set_pageblock_order(void); +unsigned long reclaim_pages(struct list_head *folio_list); unsigned int reclaim_clean_pages_from_list(struct zone *zone, - struct list_head *page_list); + struct list_head *folio_list); /* The ALLOC_WMARK bits are used as an index to zone->watermark */ #define ALLOC_WMARK_MIN WMARK_MIN #define ALLOC_WMARK_LOW WMARK_LOW