[folded-merged] mm-vmscan-add-shrinker_info_protected-helper-fix.patch removed from -mm tree

[folded-merged] mm-vmscan-add-shrinker_info_protected-helper-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-vmscan-add-shrinker_info_protected-helper-fix
has been removed from the -mm tree.  Its filename was
     mm-vmscan-add-shrinker_info_protected-helper-fix.patch

This patch was dropped because it was folded into mm-vmscan-add-shrinker_info_protected-helper.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-vmscan-add-shrinker_info_protected-helper-fix

retain rcu_dereference_protected() in free_shrinker_info(), per Hugh

Cc: Dave Chinner <david@fromorbit.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kirill Tkhai <ktkhai@virtuozzo.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Roman Gushchin <guro@fb.com>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/vmscan.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/vmscan.c~mm-vmscan-add-shrinker_info_protected-helper-fix
+++ a/mm/vmscan.c
@@ -239,7 +239,7 @@ void free_shrinker_info(struct mem_cgrou
 
 	for_each_node(nid) {
 		pn = memcg->nodeinfo[nid];
-		info = shrinker_info_protected(memcg, nid);
+		info = rcu_dereference_protected(pn->shrinker_info, true);
 		kvfree(info);
 		rcu_assign_pointer(pn->shrinker_info, NULL);
 	}
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-vmscan-add-shrinker_info_protected-helper.patch
mm-drop-redundant-arch_enable__migration-fix.patch
mm-drop-redundant-arch_enable__migration-fix-fix.patch
mm.patch
kernel-resource-allow-region_intersects-users-to-hold-resource_lock-fix.patch
linux-next-rejects.patch
cifsd-is-broken.patch
kernel-forkc-export-kernel_thread-to-modules.patch