diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-12 17:30:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-12 17:30:35 -0700 |
| commit | 20f4757fa5ed2d9a7746d01b8950cfe04d593a0a (patch) | |
| tree | e79db54fc87a2ef01e3cc2dc7ade47d8aa021c29 /include | |
| parent | e5e1170364cdb21c59638c8900b8cab7578cdb15 (diff) | |
| parent | 13cc9ee8f8ed58e563294d87d74a62006be40f21 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cgroup-defs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index f1b3151ac30b..265da00a1a8b 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -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; |