Pull cgroup fixes from Tejun Heo: - Fix a recent regression where a sleeping kernfs function is called with css_set_lock (spinlock) held - Revert the commit to enable cgroup1 support for cgroup_get_from_fd/file() Multiple users assume that the lookup only works for cgroup2 and breaks when fed a cgroup1 file. Instead, introduce a separate set of functions to lookup both v1 and v2 and use them where the user explicitly wants to support both versions. - Compat update for tools/perf/util/bpf_skel/bperf_cgroup.bpf.c. - Add Josef Bacik as a blkcg maintainer. * tag 'cgroup-for-6.1-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: blkcg: Update MAINTAINERS entry mm: cgroup: fix comments for get from fd/file helpers perf stat: Support old kernels for bperf cgroup counting bpf: cgroup_iter: support cgroup1 using cgroup fd cgroup: add cgroup_v1v2_get_from_[fd/file]() Revert "cgroup: enable cgroup_get_from_file() on cgroup1" cgroup: Reorganize css_set_lock and kernfs path processing
Showing the changes to include/linux (1 of 4 files). Show all
Unified · Split
| @@ -106,6 +106,7 @@ struct cgroup_subsys_state *css_tryget_online_from_dir(struct dentry *dentry, · 105 unmodified lines | ||
| 106 | 106 | |
| 107 | 107 | struct cgroup *cgroup_get_from_path(const char *path); |
| 108 | 108 | struct cgroup *cgroup_get_from_fd(int fd); |
| 109 | +struct cgroup *cgroup_v1v2_get_from_fd(int fd); | |
| 109 | 110 | |
| 110 | 111 | int cgroup_attach_task_all(struct task_struct *from, struct task_struct *); |
| 111 | 112 | int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from); |