| Message ID | 20210710100329.49174-4-linmiaohe@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Cleanup and fixup for vmscan | expand |
On Sat 10-07-21 18:03:27, Miaohe Lin wrote: > The return value of kswapd_run() is unused now. Clean it up. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Acked-by: Michal Hocko <mhocko@suse.com> > --- > include/linux/swap.h | 2 +- > mm/vmscan.c | 7 ++----- > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/include/linux/swap.h b/include/linux/swap.h > index 6f5a43251593..717e6e500929 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -408,7 +408,7 @@ static inline bool node_reclaim_enabled(void) > > extern void check_move_unevictable_pages(struct pagevec *pvec); > > -extern int kswapd_run(int nid); > +extern void kswapd_run(int nid); > extern void kswapd_stop(int nid); > > #ifdef CONFIG_SWAP > diff --git a/mm/vmscan.c b/mm/vmscan.c > index fbe53e60b248..c580bef6b885 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -4284,23 +4284,20 @@ unsigned long shrink_all_memory(unsigned long nr_to_reclaim) > * This kswapd start function will be called by init and node-hot-add. > * On node-hot-add, kswapd will moved to proper cpus if cpus are hot-added. > */ > -int kswapd_run(int nid) > +void kswapd_run(int nid) > { > pg_data_t *pgdat = NODE_DATA(nid); > - int ret = 0; > > if (pgdat->kswapd) > - return 0; > + return; > > pgdat->kswapd = kthread_run(kswapd, pgdat, "kswapd%d", nid); > if (IS_ERR(pgdat->kswapd)) { > /* failure at boot is fatal */ > BUG_ON(system_state < SYSTEM_RUNNING); > pr_err("Failed to start kswapd on node %d\n", nid); > - ret = PTR_ERR(pgdat->kswapd); > pgdat->kswapd = NULL; > } > - return ret; > } > > /* > -- > 2.23.0
diff --git a/include/linux/swap.h b/include/linux/swap.h index 6f5a43251593..717e6e500929 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -408,7 +408,7 @@ static inline bool node_reclaim_enabled(void) extern void check_move_unevictable_pages(struct pagevec *pvec); -extern int kswapd_run(int nid); +extern void kswapd_run(int nid); extern void kswapd_stop(int nid); #ifdef CONFIG_SWAP diff --git a/mm/vmscan.c b/mm/vmscan.c index fbe53e60b248..c580bef6b885 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4284,23 +4284,20 @@ unsigned long shrink_all_memory(unsigned long nr_to_reclaim) * This kswapd start function will be called by init and node-hot-add. * On node-hot-add, kswapd will moved to proper cpus if cpus are hot-added. */ -int kswapd_run(int nid) +void kswapd_run(int nid) { pg_data_t *pgdat = NODE_DATA(nid); - int ret = 0; if (pgdat->kswapd) - return 0; + return; pgdat->kswapd = kthread_run(kswapd, pgdat, "kswapd%d", nid); if (IS_ERR(pgdat->kswapd)) { /* failure at boot is fatal */ BUG_ON(system_state < SYSTEM_RUNNING); pr_err("Failed to start kswapd on node %d\n", nid); - ret = PTR_ERR(pgdat->kswapd); pgdat->kswapd = NULL; } - return ret; } /*
The return value of kswapd_run() is unused now. Clean it up. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> --- include/linux/swap.h | 2 +- mm/vmscan.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-)