From 747c4df31a511fd2ba5554418e9cdedecefa19a7 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Fri, 21 Apr 2023 18:08:27 +0200 Subject: [PATCH] file_utils: rename fd_make_nonblocking to fd_make_blocking Currently, fd_make_nonblocking does exactly the opposite thing, it clears O_NONBLOCK flag and makes fd blocking. Signed-off-by: Alexander Mikhalitsyn --- src/lxc/file_utils.c | 2 +- src/lxc/file_utils.h | 2 +- src/lxc/seccomp.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c index 2e47f7ea9..fed566565 100644 --- a/src/lxc/file_utils.c +++ b/src/lxc/file_utils.c @@ -688,7 +688,7 @@ int open_at_same(int fd_same, int dfd, const char *path, unsigned int o_flags, return move_fd(fd); } -int fd_make_nonblocking(int fd) +int fd_make_blocking(int fd) { int flags; diff --git a/src/lxc/file_utils.h b/src/lxc/file_utils.h index fc20da5a2..a51c139b9 100644 --- a/src/lxc/file_utils.h +++ b/src/lxc/file_utils.h @@ -109,7 +109,7 @@ __hidden extern int open_at_same(int fd_same, int dfd, const char *path, unsigned int o_flags, unsigned int resolve_flags, mode_t mode); __hidden extern int open_beneath(int dfd, const char *path, unsigned int flags); -__hidden int fd_make_nonblocking(int fd); +__hidden int fd_make_blocking(int fd); __hidden extern char *read_file_at(int dfd, const char *fnam, unsigned int o_flags, unsigned resolve_flags); diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c index 5a725f677..cefa18d0a 100644 --- a/src/lxc/seccomp.c +++ b/src/lxc/seccomp.c @@ -1282,8 +1282,8 @@ int lxc_seccomp_load(struct lxc_conf *conf) return -1; } - if (fd_make_nonblocking(ret)) - return log_error_errno(-1, errno, "Failed to make seccomp listener fd non-blocking");; + if (fd_make_blocking(ret)) + return log_error_errno(-1, errno, "Failed to make seccomp listener fd blocking"); conf->seccomp.notifier.notify_fd = ret; TRACE("Retrieved new seccomp listener fd %d", ret);