From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 27 Nov 2024 17:28:12 +0000 (+0100)
Subject: nsresourced: log about correct errno in userns_destroy_cgroup()
X-Git-Tag: v257-rc3~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F35386%2Fhead;p=thirdparty%2Fsystemd.git

nsresourced: log about correct errno in userns_destroy_cgroup()
---

diff --git a/src/nsresourced/userns-registry.c b/src/nsresourced/userns-registry.c
index 8c62e717081..a77ebc589b9 100644
--- a/src/nsresourced/userns-registry.c
+++ b/src/nsresourced/userns-registry.c
@@ -530,11 +530,11 @@ static int userns_destroy_cgroup(uint64_t cgroup_id) {
 
         cgroup_fd = cg_cgroupid_open(/* cgroupfsfd= */ -EBADF, cgroup_id);
         if (cgroup_fd == -ESTALE) {
-                log_debug_errno(cgroup_fd, "Control group %" PRIu64 " already gone, ignoring: %m", cgroup_id);
+                log_debug_errno(cgroup_fd, "Control group %" PRIu64 " already gone, ignoring.", cgroup_id);
                 return 0;
         }
         if (cgroup_fd < 0)
-                return log_debug_errno(errno, "Failed to open cgroup %" PRIu64 ", ignoring: %m", cgroup_id);
+                return log_debug_errno(cgroup_fd, "Failed to open cgroup %" PRIu64 ", ignoring: %m", cgroup_id);
 
         _cleanup_free_ char *path = NULL;
         r = fd_get_path(cgroup_fd, &path);
@@ -547,7 +547,7 @@ static int userns_destroy_cgroup(uint64_t cgroup_id) {
         if (isempty(e))
                 return log_debug_errno(SYNTHETIC_ERRNO(EPERM), "Got root cgroup path, which can't be right, refusing.");
 
-        log_debug("Path of cgroup %" PRIu64 " is: %s", cgroup_id, path);
+        log_debug("Destroying cgroup %" PRIu64 " (%s)", cgroup_id, path);
 
         _cleanup_free_ char *fname = NULL;
         r = path_extract_filename(path, &fname);