dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-05 07:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26559 from yuwata/sd-event-memory-pressure-follow-ups

Browse Source 
sd-event: follow-ups for memory pressure event source
This commit is contained in:
Lennart Poettering
2023-02-23 09:27:20 +01:00
committed by GitHub
parent dcef5e293f 63b1e67ed9
commit ca06d8984f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libsystemd/sd-event/sd-event.c
View File

@@ -1917,7 +1917,7 @@ _public_ int sd_event_add_memory_pressure(
_cleanup_(source_freep) sd_event_source *s = NULL;
_cleanup_close_ int path_fd = -1, fd = -1;
_cleanup_free_ void *write_buffer = NULL;
const char *watch, *watch_fallback, *env;
const char *watch, *watch_fallback = NULL, *env;
size_t write_buffer_size = 0;
struct stat st;
uint32_t events;
@@ -2028,10 +2028,11 @@ _public_ int sd_event_add_memory_pressure(
return locked ? -ENOENT : -EOPNOTSUPP;
path_fd = open(watch_fallback, O_PATH|O_CLOEXEC);
if (errno == ENOENT) /* PSI is not available in the kernel even under the fallback path? */
return -EOPNOTSUPP;
if (errno < 0)
if (path_fd < 0) {
if (errno == ENOENT) /* PSI is not available in the kernel even under the fallback path? */
return -EOPNOTSUPP;
return -errno;
}
}
if (fstat(path_fd, &st) < 0)