Commit 20f4757f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cgroup fixes from Tejun Heo:

 - In cgroup1, the `tasks` file could have duplicate pids which can
   trigger a warning in seq_file. Fix it by removing duplicate items
   after sorting

 - Comment update

* tag 'cgroup-for-6.6-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: Fix incorrect css_set_rwsem reference in comment
  cgroup: Remove duplicates in cgroup v1 tasks file
parents e5e11703 13cc9ee8

include/linux/cgroup-defs.h

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ struct css_set { 
	 * Lists running through all tasks using this cgroup group.

	 * mg_tasks lists tasks which belong to this cset but are in the

	 * process of being migrated out or in.  Protected by

	 * css_set_rwsem, but, during migration, once tasks are moved to

	 * css_set_lock, but, during migration, once tasks are moved to

	 * mg_tasks, it can be read safely while holding cgroup_mutex.

	 */

	struct list_head tasks;

kernel/cgroup/cgroup-v1.c

+2 −3
Original line number Diff line number Diff line
@@ -360,9 +360,8 @@ static int pidlist_array_load(struct cgroup *cgrp, enum cgroup_filetype type, 
	}

	css_task_iter_end(&it);

	length = n;

	/* now sort & (if procs) strip out duplicates */

	/* now sort & strip out duplicates (tgids or recycled thread PIDs) */

	sort(array, length, sizeof(pid_t), cmppid, NULL);

	if (type == CGROUP_FILE_PROCS)

	length = pidlist_uniq(array, length);



	l = cgroup_pidlist_find_create(cgrp, type);