Commit 74b4cc9b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cgroup-for-6.16-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 

Pull cgroup fix from Tejun Heo:

 - In cgroup1 freezer, a task migrating into a frozen cgroup might not
   get frozen immediately due to the wrong operation order. Fix it.

* tag 'cgroup-for-6.16-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup,freezer: fix incomplete freezing when attaching tasks
parents 0564e6a8 37fb58a7

kernel/cgroup/legacy_freezer.c

+1 −2
Original line number Diff line number Diff line
@@ -188,13 +188,12 @@ static void freezer_attach(struct cgroup_taskset *tset) 
		if (!(freezer->state & CGROUP_FREEZING)) {

			__thaw_task(task);

		} else {

			freeze_task(task);



			/* clear FROZEN and propagate upwards */

			while (freezer && (freezer->state & CGROUP_FROZEN)) {

				freezer->state &= ~CGROUP_FROZEN;

				freezer = parent_freezer(freezer);

			}

			freeze_task(task);

		}

	}