morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

pidfd-util: dont open a new pidfd unnecessarily in pidfd_check_pidfs()

Browse Source
This commit is contained in:
Lennart Poettering
2025-01-17 14:01:30 +01:00
parent 81cf3dc466
commit 5dc9d5b4ea
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/basic/pidfd-util.c
View File

@@ -18,16 +18,14 @@
static int have_pidfs = -1;
static int pidfd_check_pidfs(void) {
static int pidfd_check_pidfs(int pid_fd) {
/* NB: the passed fd *must* be acquired via pidfd_open(), i.e. must be a true pidfd! */
if (have_pidfs >= 0)
return have_pidfs;
_cleanup_close_ int fd = pidfd_open(getpid_cached(), 0);
if (fd < 0)
return -errno;
return (have_pidfs = fd_is_fs_type(fd, PID_FS_MAGIC));
return (have_pidfs = fd_is_fs_type(pid_fd, PID_FS_MAGIC));
}
int pidfd_get_namespace(int fd, unsigned long ns_type_cmd) {
@@ -231,7 +229,7 @@ int pidfd_get_inode_id(int fd, uint64_t *ret) {
assert(fd >= 0);
r = pidfd_check_pidfs();
r = pidfd_check_pidfs(fd);
if (r < 0)
return r;
if (r == 0)