SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdset: do not call fd_get_path() if debug logging is off

Browse Source 
Follow-up for 89065ada83
This commit is contained in:
Mike Yuan
2026-01-21 15:55:06 +01:00
parent 1886047e59
commit 13c0351ba4
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/fdset.c
+25 -16
View File
@@ -183,7 +183,7 @@ int fdset_new_fill(
return log_debug_errno(SYNTHETIC_ERRNO(ENOSYS),
"Failed to open /proc/self/fd/, /proc/ is not mounted.");
return log_debug_errno(errno, "Failed to open /proc/self/fd/: %m ");
return log_debug_errno(errno, "Failed to open /proc/self/fd/: %m");
}
s = fdset_new();
@@ -214,11 +214,14 @@ int fdset_new_fill(
fl = RET_NERRNO(fcntl(fd, F_GETFD));
if (fl < 0) {
_cleanup_free_ char *path = NULL;
(void) fd_get_path(fd, &path);
return log_debug_errno(fl,
"Failed to get flag of fd=%d (%s): %m ",
fd, strna(path));
if (DEBUG_LOGGING) {
_cleanup_free_ char *path = NULL;
(void) fd_get_path(fd, &path);
log_debug_errno(fl, "Failed to get flags of fd=%d (%s): %m",
fd, strna(path));
}
return fl;
}
if (FLAGS_SET(fl, FD_CLOEXEC) != !!filter_cloexec)
@@ -229,21 +232,27 @@ int fdset_new_fill(
if (filter_cloexec <= 0) {
r = fd_cloexec(fd, true);
if (r < 0) {
_cleanup_free_ char *path = NULL;
(void) fd_get_path(fd, &path);
return log_debug_errno(r,
"Failed to set CLOEXEC flag fd=%d (%s): %m ",
fd, strna(path));
if (DEBUG_LOGGING) {
_cleanup_free_ char *path = NULL;
(void) fd_get_path(fd, &path);
log_debug_errno(r, "Failed to set CLOEXEC flag on fd=%d (%s): %m",
fd, strna(path));
}
return r;
}
}
r = fdset_put(s, fd);
if (r < 0) {
_cleanup_free_ char *path = NULL;
(void) fd_get_path(fd, &path);
return log_debug_errno(r,
"Failed to put fd=%d (%s) into fdset: %m ",
fd, strna(path));
if (DEBUG_LOGGING) {
_cleanup_free_ char *path = NULL;
(void) fd_get_path(fd, &path);
log_debug_errno(r, "Failed to put fd=%d (%s) into fdset: %m",
fd, strna(path));
}
return r;
}
}