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

pidref: drop support for kernels lacking waitid(P_PIDFD, …)

Browse Source 
Our baseline is not 5.4, which is where P_PIDFD was introduced.
This commit is contained in:
Lennart Poettering
2025-01-08 14:51:19 +01:00
parent 06744cbb52
commit 0df46f8908
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/pidref.c
+8 -13
View File
@@ -401,22 +401,17 @@ int pidref_wait(const PidRef *pidref, siginfo_t *ret, int options) {
return -ECHILD;
siginfo_t si = {};
if (pidref->fd >= 0) {
if (pidref->fd >= 0)
r = RET_NERRNO(waitid(P_PIDFD, pidref->fd, &si, options));
if (r >= 0) {
if (ret)
*ret = si;
return r;
}
if (r != -EINVAL) /* P_PIDFD was added in kernel 5.4 only */
return r;
}
else
r = RET_NERRNO(waitid(P_PID, pidref->pid, &si, options));
if (r < 0)
return r;
r = RET_NERRNO(waitid(P_PID, pidref->pid, &si, options));
if (r >= 0 && ret)
if (ret)
*ret = si;
return r;
return 0;
}
int pidref_wait_for_terminate(const PidRef *pidref, siginfo_t *ret) {