diff options
| author | Michal Koutný <mkoutny@suse.com> | 2022-08-26 18:52:37 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2022-08-26 22:57:41 +0200 |
| commit | fa7e439cf90ba23ea473d0b7d85efd02ae6ccf94 (patch) | |
| tree | 9361bef45e46f7ba7fd29ea16ca23405cfbfce97 /mm/memcontrol.c | |
| parent | cgroup: cgroup: Honor caller's cgroup NS when resolving cgroup id (diff) | |
| download | linux-fa7e439cf90ba23ea473d0b7d85efd02ae6ccf94.tar.xz linux-fa7e439cf90ba23ea473d0b7d85efd02ae6ccf94.zip | |
cgroup: Homogenize cgroup_get_from_id() return value
Cgroup id is user provided datum hence extend its return domain to
include possible error reason (similar to cgroup_get_from_fd()).
This change also fixes commit d4ccaf58a847 ("bpf: Introduce cgroup
iter") that would use NULL instead of proper error handling in
d4ccaf58a847 ("bpf: Introduce cgroup iter").
Additionally, neither of: fc_appid_store, bpf_iter_attach_cgroup,
mem_cgroup_get_from_ino (callers of cgroup_get_from_fd) is built without
CONFIG_CGROUPS (depends via CONFIG_BLK_CGROUP, direct, transitive
CONFIG_MEMCG respectively) transitive, so drop the singular definition
not needed with !CONFIG_CGROUPS.
Fixes: d4ccaf58a847 ("bpf: Introduce cgroup iter")
Signed-off-by: Michal Koutný <mkoutny@suse.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b69979c9ced5..86f5ca8c6fa6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5110,8 +5110,8 @@ struct mem_cgroup *mem_cgroup_get_from_ino(unsigned long ino) struct mem_cgroup *memcg; cgrp = cgroup_get_from_id(ino); - if (!cgrp) - return ERR_PTR(-ENOENT); + if (IS_ERR(cgrp)) + return PTR_ERR(cgrp); css = cgroup_get_e_css(cgrp, &memory_cgrp_subsys); if (css) |