The patch titled Subject: mm-assign-id-to-every-memcg-aware-shrinker-v9 has been removed from the -mm tree. Its filename was mm-assign-id-to-every-memcg-aware-shrinker-v9.patch This patch was dropped because it was folded into mm-assign-id-to-every-memcg-aware-shrinker.patch ------------------------------------------------------ From: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx> Subject: mm-assign-id-to-every-memcg-aware-shrinker-v9 Link: http://lkml.kernel.org/r/153112546435.4097.10607140323811756557.stgit@localhost.localdomain Signed-off-by: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx> Acked-by: Vladimir Davydov <vdavydov.dev@xxxxxxxxx> Tested-by: Shakeel Butt <shakeelb@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmscan.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/mm/vmscan.c~mm-assign-id-to-every-memcg-aware-shrinker-v9 +++ a/mm/vmscan.c @@ -178,6 +178,7 @@ static int prealloc_memcg_shrinker(struc int id, ret = -ENOMEM; down_write(&shrinker_rwsem); + /* This may call shrinker, so it must use down_read_trylock() */ id = idr_alloc(&shrinker_idr, shrinker, 0, 0, GFP_KERNEL); if (id < 0) goto unlock; @@ -375,11 +376,11 @@ void free_prealloced_shrinker(struct shr if (!shrinker->nr_deferred) return; - kfree(shrinker->nr_deferred); - shrinker->nr_deferred = NULL; - if (shrinker->flags & SHRINKER_MEMCG_AWARE) unregister_memcg_shrinker(shrinker); + + kfree(shrinker->nr_deferred); + shrinker->nr_deferred = NULL; } void register_shrinker_prepared(struct shrinker *shrinker) _ Patches currently in -mm which might be from ktkhai@xxxxxxxxxxxxx are list_lru-combine-code-under-the-same-define.patch mm-introduce-config_memcg_kmem-as-combination-of-config_memcg-config_slob.patch mm-assign-id-to-every-memcg-aware-shrinker.patch memcg-move-up-for_each_mem_cgroup-_tree-defines.patch mm-assign-memcg-aware-shrinkers-bitmap-to-memcg.patch mm-assign-memcg-aware-shrinkers-bitmap-to-memcg-v9.patch mm-assign-memcg-aware-shrinkers-bitmap-to-memcg-fix.patch mm-refactoring-in-workingset_init.patch mm-refactoring-in-workingset_init-v9.patch fs-refactoring-in-alloc_super.patch fs-propagate-shrinker-id-to-list_lru.patch list_lru-add-memcg-argument-to-list_lru_from_kmem.patch list_lru-pass-dst_memcg-argument-to-memcg_drain_list_lru_node.patch list_lru-pass-lru-argument-to-memcg_drain_list_lru_node.patch mm-export-mem_cgroup_is_root.patch mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance.patch mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9.patch mm-iterate-only-over-charged-shrinkers-during-memcg-shrink_slab.patch mm-iterate-only-over-charged-shrinkers-during-memcg-shrink_slab-v9.patch mm-add-shrink_empty-shrinker-methods-return-value.patch mm-clear-shrinker-bit-if-there-are-no-objects-related-to-memcg.patch mm-clear-shrinker-bit-if-there-are-no-objects-related-to-memcg-v9.patch mm-move-check-for-shrinker_numa_aware-to-do_shrink_slab.patch mm-use-special-value-shrinker_registering-instead-list_empty-check.patch mm-use-special-value-shrinker_registering-instead-list_empty-check-v3.patch