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: 84189 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2064945vqo; Mon, 17 Apr 2023 04:57:28 -0700 (PDT) X-Google-Smtp-Source: AKy350atBpupXBKn0OpNdx9FpEu8x5G9q8KbYjgtKPplOKwWBrXhAx2qiP6TVqTmmkNzYFZrsfu9 X-Received: by 2002:a05:6a00:1ad2:b0:63a:fb18:c54f with SMTP id f18-20020a056a001ad200b0063afb18c54fmr23848524pfv.32.1681732648500; Mon, 17 Apr 2023 04:57:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681732648; cv=none; d=google.com; s=arc-20160816; b=tsTH4mtYTCif4sz8VsCNlufDcxwZzKICuKPKef5LWdC7FXuRkG5rnKzCdmb/vWKA52 IlmWyfIa5X/C3I0kifblAwAvln37wghpBW8n0xWav1dWmSb5S/ZvQ8OfYlUloWnP75Yh jncmBMrpXuUME5hUUaOXjlqcbFWbx6yzF2hesYo2hIxsAKqSNPQhog43yODwaP4lP7Ku QcNCbR/kUVeHBipgZhHfV8246iiEL50y864IQ7ZiQX70knLYfU1VbXFgK3mtpFq5Qwad O7hGZI+kJH+3eTyBcOqoiEfSCu4Tg7InOrztE7s4+IWk0ci/psxwNTE4FTVMeNvB73DL AnJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=W7nZ+tBex5q6sNcbWRdvrLSfF9YNokrdfM307G2SAQo=; b=w1zZ14J8jofswpY6Fdp+5dyNydF13XHUMfp7IAzpmDjIwSll9bbLwpgV9PYQPiQiIt tqrPzdbPxncijZJz2IpMWv8mh9R+ZP2dWFyO/WLxHr0gxYL7z/D3x40DmWGMjJVlLBVS 6XocR5SZsRlxZkvY8Lli6vFgvQJ1VOAf5MB2LsegLvBK/50AQzPP1A/NxZXhnqSG03av u6z3Bk4QgJ4aN31AUYxbYOduSmjU6ZNSKcUoCtLmirThcxF4kMCY82+AAHpqhqfH1oM1 VkFpoPLh+RzWSKMQZ1YS0anL2d/WTVDI5oKK/LD2vfMVuiAf+ko2xWtrRUKbEAT9igKY Nlyw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x26-20020aa79a5a000000b0063b7bb98251si5955238pfj.216.2023.04.17.04.57.17; Mon, 17 Apr 2023 04:57:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229793AbjDQLfB (ORCPT + 99 others); Mon, 17 Apr 2023 07:35:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230202AbjDQLdA (ORCPT ); Mon, 17 Apr 2023 07:33:00 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4183C93F2 for ; Mon, 17 Apr 2023 04:31:58 -0700 (PDT) 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763424494065280313?= X-GMAIL-MSGID: =?utf-8?q?1763424494065280313?= 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