From 93117b0fbd82f68e8d74056ab59247f31a50c46c Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Tue, 3 Jun 2025 10:49:17 +0200 Subject: [PATCH] cgroup-util: rename 'fsfd' -> 'cgroups_fd' Makes the header and implementation consistent. --- src/basic/cgroup-util.h | 2 +- src/nsresourced/userns-registry.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index c5917296ddc..2dea0ebdc48 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -135,7 +135,7 @@ typedef enum CGroupUnified { */ int cg_path_open(const char *controller, const char *path); -int cg_cgroupid_open(int fsfd, uint64_t id); +int cg_cgroupid_open(int cgroupfs_fd, uint64_t id); int cg_path_from_cgroupid(int cgroupfs_fd, uint64_t id, char **ret); int cg_get_cgroupid_at(int dfd, const char *path, uint64_t *ret); diff --git a/src/nsresourced/userns-registry.c b/src/nsresourced/userns-registry.c index 464bbee55aa..8d31d163591 100644 --- a/src/nsresourced/userns-registry.c +++ b/src/nsresourced/userns-registry.c @@ -639,7 +639,7 @@ static int userns_destroy_cgroup(uint64_t cgroup_id) { _cleanup_close_ int cgroup_fd = -EBADF, parent_fd = -EBADF; int r; - cgroup_fd = cg_cgroupid_open(/* cgroupfsfd= */ -EBADF, cgroup_id); + cgroup_fd = cg_cgroupid_open(/* cgroupfs_fd= */ -EBADF, cgroup_id); if (cgroup_fd == -ESTALE) { log_debug_errno(cgroup_fd, "Control group %" PRIu64 " already gone, ignoring.", cgroup_id); return 0; -- 2.47.3