shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

nsresourced: log about correct errno (#35386)

Browse Source 
Split out from #35242
This commit is contained in:
Luca Boccassi 2024-11-27 19:26:41 +00:00 committed by GitHub
commit 723069188d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/basic/cgroup-util.c
View File

@ -65,11 +65,7 @@ int cg_cgroupid_open(int cgroupfs_fd, uint64_t id) {
cg_file_handle fh = CG_FILE_HANDLE_INIT; cg_file_handle fh = CG_FILE_HANDLE_INIT;
CG_FILE_HANDLE_CGROUPID(fh) = id; CG_FILE_HANDLE_CGROUPID(fh) = id;
int fd = open_by_handle_at(cgroupfs_fd, &fh.file_handle, O_DIRECTORY|O_CLOEXEC); return RET_NERRNO(open_by_handle_at(cgroupfs_fd, &fh.file_handle, O_DIRECTORY|O_CLOEXEC));
if (fd < 0)
return -errno;
return fd;
} }
static int cg_enumerate_items(const char *controller, const char *path, FILE **ret, const char *item) { static int cg_enumerate_items(const char *controller, const char *path, FILE **ret, const char *item) {

6
src/nsresourced/userns-registry.c
View File

@ -530,11 +530,11 @@ static int userns_destroy_cgroup(uint64_t cgroup_id) {
cgroup_fd = cg_cgroupid_open(/* cgroupfsfd= */ -EBADF, cgroup_id); cgroup_fd = cg_cgroupid_open(/* cgroupfsfd= */ -EBADF, cgroup_id);
if (cgroup_fd == -ESTALE) { 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; return 0;
} }
if (cgroup_fd < 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; _cleanup_free_ char *path = NULL;
r = fd_get_path(cgroup_fd, &path); r = fd_get_path(cgroup_fd, &path);
@ -547,7 +547,7 @@ static int userns_destroy_cgroup(uint64_t cgroup_id) {
if (isempty(e)) if (isempty(e))
return log_debug_errno(SYNTHETIC_ERRNO(EPERM), "Got root cgroup path, which can't be right, refusing."); 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; _cleanup_free_ char *fname = NULL;
r = path_extract_filename(path, &fname); r = path_extract_filename(path, &fname);