Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80a6a2cf authored by Li Zefan's avatar Li Zefan Committed by Linus Torvalds
Browse files

freezer_cg: remove redundant check in freezer_can_attach() 



It is sufficient to check if @task is frozen, and no need to check if the
original freezer is frozen.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Acked-by: default avatarCedric Le Goater <clg@fr.ibm.com>
Acked-by: default avatarMatt Helsley <matthltc@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7ccb9743

kernel/cgroup_freezer.c

+7 −9
Original line number Diff line number Diff line
@@ -162,9 +162,13 @@ static int freezer_can_attach(struct cgroup_subsys *ss, 
			      struct task_struct *task)

{

	struct freezer *freezer;

	int retval;



	/* Anything frozen can't move or be moved to/from */

	/*

	 * Anything frozen can't move or be moved to/from.

	 *

	 * Since orig_freezer->state == FROZEN means that @task has been

	 * frozen, so it's sufficient to check the latter condition.

	 */



	if (is_task_frozen_enough(task))

		return -EBUSY;
@@ -173,13 +177,7 @@ static int freezer_can_attach(struct cgroup_subsys *ss, 
	if (freezer->state == CGROUP_FROZEN)

		return -EBUSY;



	retval = 0;

	task_lock(task);

	freezer = task_freezer(task);

	if (freezer->state == CGROUP_FROZEN)

		retval = -EBUSY;

	task_unlock(task);

	return retval;

	return 0;

}



static void freezer_fork(struct cgroup_subsys *ss, struct task_struct *task)