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 <wangkefeng.wang@huawei.com>
---
 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
-- 
2.35.3

On 17.04.23 13:48, Kefeng Wang wrote:
> 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 <wangkefeng.wang@huawei.com>
> ---

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Thanks,

David / dhildenb

On Mon, 17 Apr 2023 19:48:07 +0800 Kefeng Wang <wangkefeng.wang@huawei.com> wrote:

> 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 <wangkefeng.wang@huawei.com>

Reviewed-by: SeongJae Park <sj@kernel.org>


Thanks,
SJ

[...]

On Mon, Apr 17, 2023 at 07:48:07PM +0800, Kefeng Wang wrote:
> 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 <wangkefeng.wang@huawei.com>

Reviwed-by: Matthew Wilcox (Oracle) <willy@infradead.org>