The patch titled Subject: memcg: fix error code in hugetlb_force_memcg_empty() has been removed from the -mm tree. Its filename was memcg-fix-error-code-in-hugetlb_force_memcg_empty.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Subject: memcg: fix error code in hugetlb_force_memcg_empty() The force_empty interface allows us to make the memcg empty only when the cgroup doesn't include any tasks. # echo 0 > /cgroup/xxxx/memory.force_empty If the cgroup isn't empty, force_empty does nothing and returns -EBUSY. But the hugetlb implementation has an inconsitency with this and returns 0 and do nothing. Fix it to return -EBUSY. Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx> Cc: Ying Han <yinghan@xxxxxxxxxx> Cc: Glauber Costa <glommer@xxxxxxxxxxxxx> Reviewed-by: Tejun Heo <tj@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/hugetlb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN mm/hugetlb.c~memcg-fix-error-code-in-hugetlb_force_memcg_empty mm/hugetlb.c --- a/mm/hugetlb.c~memcg-fix-error-code-in-hugetlb_force_memcg_empty +++ a/mm/hugetlb.c @@ -1922,8 +1922,11 @@ int hugetlb_force_memcg_empty(struct cgr int ret = 0, idx = 0; do { - if (cgroup_task_count(cgroup) || !list_empty(&cgroup->children)) + if (cgroup_task_count(cgroup) + || !list_empty(&cgroup->children)) { + ret = -EBUSY; goto out; + } /* * If the task doing the cgroup_rmdir got a signal * we don't really need to loop till the hugetlb resource _ Patches currently in -mm which might be from kamezawa.hiroyu@xxxxxxxxxxxxxx are linux-next.patch memcg-rename-mem_cgroup_stat_swapout-as-mem_cgroup_stat_swap.patch memcg-rename-mem_cgroup_charge_type_mapped-as-mem_cgroup_charge_type_anon.patch memcg-remove-mem_cgroup_charge_type_force.patch memcg-fix-error-code-in-hugetlb_force_memcg_empty-v2.patch memcg-fix-error-code-in-hugetlb_force_memcg_empty-v2-checkpatch-fixes.patch memcg-use-res_counter_uncharge_until-in-mem_cgroup_move_hugetlb_parent.patch memcg-move-charges-to-root-cgroup-if-use_hierarchy=0-in-mem_cgroup_move_hugetlb_parent.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html