mm/vmscan: add a new member reclaim_state in struct shrink_control fix

Commit Message

Yafang Shao June 24, 2019, 1:06 p.m. UTC

The earlier commit
"mm/vmscan.c: add a new member reclaim_state in struct shrink_control"
forgot to remove the reclaim_state assignment from __perform_reclaim()
pointed by Kirill.
This patch is to fix it.

Signed-off-by: Yafang Shao <[e-mail]>
Reviewed-by: Kirill Tkhai <[e-mail]>
---
 mm/page_alloc.c | 4 ----
 1 file changed, 4 deletions(-)

Patch

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index b178f29..3238b96 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4046,7 +4046,6 @@  void fs_reclaim_release(gfp_t gfp_mask)
 __perform_reclaim(gfp_t gfp_mask, unsigned int order,
 					const struct alloc_context *ac)
 {
-	struct reclaim_state reclaim_state;
 	int progress;
 	unsigned int noreclaim_flag;
 	unsigned long pflags;
@@ -4058,13 +4057,10 @@  void fs_reclaim_release(gfp_t gfp_mask)
 	psi_memstall_enter(&pflags);
 	fs_reclaim_acquire(gfp_mask);
 	noreclaim_flag = memalloc_noreclaim_save();
-	reclaim_state.reclaimed_slab = 0;
-	current->reclaim_state = &reclaim_state;
 
 	progress = try_to_free_pages(ac->zonelist, order, gfp_mask,
 								ac->nodemask);
 
-	current->reclaim_state = NULL;
 	memalloc_noreclaim_restore(noreclaim_flag);
 	fs_reclaim_release(gfp_mask);
 	psi_memstall_leave(&pflags);