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 <aleksandr.mikhalitsyn@canonical.com>

diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index 2e47f7ea906592020f673316fd63893e8f3ee851..fed566565f8e562f36d9350a72ff6322674e8bd7 100644 (file)
--- 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 fc20da5a2f077d7c5f13e9ccd6b4dfcc88f733ea..a51c139b9c3d9918f35c4a3735a3c05775e1bc9a 100644 (file)
--- 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 5a725f677bdad64a6722306fcdc9fbef017265bb..cefa18d0ab4e69d82ff7f4c3068b7fff2e00948a 100644 (file)
--- 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);