The patch titled
Subject: mm/vmscan: add a new member reclaim_state in struct shrink_control fix
has been added to the -mm tree. Its filename is
mm-vmscan-add-a-new-member-reclaim_state-in-struct-shrink_control-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-vmscan-add-a-new-member-reclaim_state-in-struct-shrink_control-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-vmscan-add-a-new-member-reclaim_state-in-struct-shrink_control-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Yafang Shao <laoar.shao@xxxxxxxxx>
Subject: mm/vmscan: add a new member reclaim_state in struct shrink_control fix
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.
Link: http://lkml.kernel.org/r/1561381582-13697-1-git-send-email-laoar.shao@xxxxxxxxx
Signed-off-by: Yafang Shao <laoar.shao@xxxxxxxxx>
Reviewed-by: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 4 ----
1 file changed, 4 deletions(-)
--- a/mm/page_alloc.c~mm-vmscan-add-a-new-member-reclaim_state-in-struct-shrink_control-fix
+++ a/mm/page_alloc.c
@@ -4098,7 +4098,6 @@ static int
__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;
@@ -4110,13 +4109,10 @@ __perform_reclaim(gfp_t gfp_mask, unsign
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);
_
Patches currently in -mm which might be from laoar.shao@xxxxxxxxx are
mm-oom_kill-fix-uninitialized-oc-constraint.patch
mm-vmscan-expose-cgroup_ino-for-memcg-reclaim-tracepoints.patch
mm-vmscan-add-a-new-member-reclaim_state-in-struct-shrink_control.patch
mm-vmscan-add-a-new-member-reclaim_state-in-struct-shrink_control-fix.patch
mm-vmscan-calculate-reclaimed-slab-caches-in-all-reclaim-paths.patch
