mm/vmscan.c: change prototype for shrink_page_list

commit 3c710c1ad11b ("mm, vmscan extract shrink_page_list reclaim counters
into a struct") changed data type for the function, so changing return
type for funciton and its caller.

Signed-off-by: Vaneet Narang <v.narang@samsung.com>
Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Amit Sahrawat <a.sahrawat@samsung.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Vlastimil Babka <vbabka@suse.cz>
Link: http://lkml.kernel.org/r/1588168259-25604-1-git-send-email-maninder1.s@samsung.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/internal.h b/mm/internal.h
index b1f0afcbe016a60433f139af7bc438265f936d13..9117bca90f4bc282e62c88c6e4056ddb76fa3ea9 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -538,7 +538,7 @@ 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_clean_pages_from_list(struct zone *zone,
+unsigned int reclaim_clean_pages_from_list(struct zone *zone,
                                            struct list_head *page_list);
 /* The ALLOC_WMARK bits are used as an index to zone->watermark */
 #define ALLOC_WMARK_MIN                WMARK_MIN

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 987d1638588f5f83b2d83cc4216fc631c4c1a133..cf0a1720e9d8a3911108eb495fc4ce39c67edd49 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -8355,7 +8355,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
                                        unsigned long start, unsigned long end)
 {
        /* This function is based on compact_zone() from compaction.c. */
-       unsigned long nr_reclaimed;
+       unsigned int nr_reclaimed;
        unsigned long pfn = start;
        unsigned int tries = 0;
        int ret = 0;

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 8be3d52548ca11494cddb804bce4102f063c984e..0539c6766a24a38149b3ac6a06b18779c9529764 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1066,17 +1066,17 @@ static void page_check_dirty_writeback(struct page *page,
 /*
  * shrink_page_list() returns the number of reclaimed pages
  */
-static unsigned long shrink_page_list(struct list_head *page_list,
-                                     struct pglist_data *pgdat,
-                                     struct scan_control *sc,
-                                     enum ttu_flags ttu_flags,
-                                     struct reclaim_stat *stat,
-                                     bool ignore_references)
+static unsigned int shrink_page_list(struct list_head *page_list,
+                                    struct pglist_data *pgdat,
+                                    struct scan_control *sc,
+                                    enum ttu_flags ttu_flags,
+                                    struct reclaim_stat *stat,
+                                    bool ignore_references)
 {
        LIST_HEAD(ret_pages);
        LIST_HEAD(free_pages);
-       unsigned nr_reclaimed = 0;
-       unsigned pgactivate = 0;
+       unsigned int nr_reclaimed = 0;
+       unsigned int pgactivate = 0;
 
        memset(stat, 0, sizeof(*stat));
        cond_resched();
@@ -1487,7 +1487,7 @@ keep:
        return nr_reclaimed;
 }
 
-unsigned long reclaim_clean_pages_from_list(struct zone *zone,
+unsigned int reclaim_clean_pages_from_list(struct zone *zone,
                                            struct list_head *page_list)
 {
        struct scan_control sc = {
@@ -1496,7 +1496,7 @@ unsigned long reclaim_clean_pages_from_list(struct zone *zone,
                .may_unmap = 1,
        };
        struct reclaim_stat stat;
-       unsigned long nr_reclaimed;
+       unsigned int nr_reclaimed;
        struct page *page, *next;
        LIST_HEAD(clean_pages);
 
@@ -1910,7 +1910,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec,
 {
        LIST_HEAD(page_list);
        unsigned long nr_scanned;
-       unsigned long nr_reclaimed = 0;
+       unsigned int nr_reclaimed = 0;
        unsigned long nr_taken;
        struct reclaim_stat stat;
        int file = is_file_lru(lru);
@@ -2106,7 +2106,7 @@ static void shrink_active_list(unsigned long nr_to_scan,
 unsigned long reclaim_pages(struct list_head *page_list)
 {
        int nid = NUMA_NO_NODE;
-       unsigned long nr_reclaimed = 0;
+       unsigned int nr_reclaimed = 0;
        LIST_HEAD(node_page_list);
        struct reclaim_stat dummy_stat;
        struct page *page;