The patch titled freezer_cg: simplify freezer_change_state() has been removed from the -mm tree. Its filename was freezer_cg-simplify-freezer_change_state.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: freezer_cg: simplify freezer_change_state() From: Li Zefan <lizf@xxxxxxxxxxxxxx> Just call unfreeze_cgroup() if goal_state == THAWED, and call try_to_freeze_cgroup() if goal_state == FROZEN. No behavior has been changed. Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx> Acked-by: Cedric Le Goater <clg@xxxxxxxxxx> Acked-by: Matt Helsley <matthltc@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/cgroup_freezer.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff -puN kernel/cgroup_freezer.c~freezer_cg-simplify-freezer_change_state kernel/cgroup_freezer.c --- a/kernel/cgroup_freezer.c~freezer_cg-simplify-freezer_change_state +++ a/kernel/cgroup_freezer.c @@ -296,27 +296,22 @@ static int freezer_change_state(struct c int retval = 0; freezer = cgroup_freezer(cgroup); + spin_lock_irq(&freezer->lock); + update_freezer_state(cgroup, freezer); if (goal_state == freezer->state) goto out; - switch (freezer->state) { + + switch (goal_state) { case CGROUP_THAWED: - retval = try_to_freeze_cgroup(cgroup, freezer); + unfreeze_cgroup(cgroup, freezer); break; - case CGROUP_FREEZING: - if (goal_state == CGROUP_FROZEN) { - /* Userspace is retrying after - * "/bin/echo FROZEN > freezer.state" returned -EBUSY */ - retval = try_to_freeze_cgroup(cgroup, freezer); - break; - } - /* state == FREEZING and goal_state == THAWED, so unfreeze */ case CGROUP_FROZEN: - unfreeze_cgroup(cgroup, freezer); + retval = try_to_freeze_cgroup(cgroup, freezer); break; default: - break; + BUG(); } out: spin_unlock_irq(&freezer->lock); _ Patches currently in -mm which might be from lizf@xxxxxxxxxxxxxx are cgroups-fix-invalid-cgrp-dentry-before-cgroup-has-been-completely-removed.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