summaryrefslogtreecommitdiffstats
path: root/block/blk-cgroup-fc-appid.c
diff options
context:
space:
mode:
authorMichal Koutný <mkoutny@suse.com>2022-08-26 18:52:37 +0200
committerTejun Heo <tj@kernel.org>2022-08-26 22:57:41 +0200
commitfa7e439cf90ba23ea473d0b7d85efd02ae6ccf94 (patch)
tree9361bef45e46f7ba7fd29ea16ca23405cfbfce97 /block/blk-cgroup-fc-appid.c
parentcgroup: cgroup: Honor caller's cgroup NS when resolving cgroup id (diff)
downloadlinux-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 'block/blk-cgroup-fc-appid.c')
-rw-r--r--block/blk-cgroup-fc-appid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-cgroup-fc-appid.c b/block/blk-cgroup-fc-appid.c
index 760a2e1878dd..842e5e1c0f3c 100644
--- a/block/blk-cgroup-fc-appid.c
+++ b/block/blk-cgroup-fc-appid.c
@@ -19,8 +19,8 @@ int blkcg_set_fc_appid(char *app_id, u64 cgrp_id, size_t app_id_len)
return -EINVAL;
cgrp = cgroup_get_from_id(cgrp_id);
- if (!cgrp)
- return -ENOENT;
+ if (IS_ERR(cgrp))
+ return PTR_ERR(cgrp);
css = cgroup_get_e_css(cgrp, &io_cgrp_subsys);
if (!css) {
ret = -ENOENT;