From 766df09fde0dfbac61f74ed01bb238c524f9b073 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Fri, 26 Feb 2021 00:42:09 +0100 Subject: [PATCH] tree-wide: use new logging helpers Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 2 +- src/lxc/commands.c | 6 +++--- src/lxc/log.h | 36 +++++++++++++++++++++--------------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index b9cbbe8298..733f6b9748 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -3028,7 +3028,7 @@ static int __list_cgroup_delegate(char ***delegate) } *delegate = move_ptr(list); - return syswarn(0, "Failed to read /sys/kernel/cgroup/delegate"); + return syswarn_ret(0, "Failed to read /sys/kernel/cgroup/delegate"); } lxc_iterate_parts(token, buf, " \t\n") { diff --git a/src/lxc/commands.c b/src/lxc/commands.c index fd554bff48..d4d9886ab5 100644 --- a/src/lxc/commands.c +++ b/src/lxc/commands.c @@ -354,7 +354,7 @@ static int __lxc_cmd_rsp_send(int fd, struct lxc_cmd_rsp *rsp) ret = lxc_send_nointr(fd, rsp->data, rsp->datalen, MSG_NOSIGNAL); if (ret < 0 || ret != (ssize_t)rsp->datalen) - return syswarn(-errno, "Failed to send command response %zd", ret); + return syswarn("Failed to send command response %zd", ret); return 0; } @@ -392,7 +392,7 @@ static inline int rsp_one_fd_reap(int fd, int fd_send, struct lxc_cmd_rsp *rsp) if (rsp->data && rsp->datalen > 0) { ret = lxc_send_nointr(fd, rsp->data, rsp->datalen, MSG_NOSIGNAL); if (ret < 0 || ret != (ssize_t)rsp->datalen) - return syswarn(-errno, "Failed to send command response %zd", ret); + return syswarn("Failed to send command response %zd", ret); } return LXC_CMD_REAP_CLIENT_FD; @@ -430,7 +430,7 @@ __access_r(3, 2) static int rsp_many_fds_reap(int fd, __u32 fds_len, if (rsp->data && rsp->datalen > 0) { ret = lxc_send_nointr(fd, rsp->data, rsp->datalen, MSG_NOSIGNAL); if (ret < 0 || ret != (ssize_t)rsp->datalen) - return syswarn(-errno, "Failed to send command response %zd", ret); + return syswarn("Failed to send command response %zd", ret); } return LXC_CMD_REAP_CLIENT_FD; diff --git a/src/lxc/log.h b/src/lxc/log.h index e8ffb664e0..70344e642b 100644 --- a/src/lxc/log.h +++ b/src/lxc/log.h @@ -494,13 +494,6 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ __internal_ret__; \ }) -#define syswarn(__ret__, format, ...) \ - ({ \ - typeof(__ret__) __internal_ret__ = (__ret__); \ - SYSWARN(format, ##__VA_ARGS__); \ - __internal_ret__; \ - }) - #define systrace(__ret__, format, ...) \ ({ \ typeof(__ret__) __internal_ret__ = (__ret__); \ @@ -515,14 +508,6 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ __internal_ret__; \ }) -#define syswarn_set(__ret__, format, ...) \ - ({ \ - typeof(__ret__) __internal_ret__ = (__ret__); \ - errno = labs(__ret__); \ - SYSWARN(format, ##__VA_ARGS__); \ - __internal_ret__; \ - }) - #define log_error(__ret__, format, ...) \ ({ \ typeof(__ret__) __internal_ret__ = (__ret__); \ @@ -612,6 +597,27 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ __internal_ret__; \ }) +#define syswarn(format, ...) \ + ({ \ + SYSWARN(format, ##__VA_ARGS__); \ + (-errno); \ + }) + +#define syswarn_set(__ret__, format, ...) \ + ({ \ + typeof(__ret__) __internal_ret__ = (__ret__); \ + errno = labs(__ret__); \ + SYSWARN(format, ##__VA_ARGS__); \ + __internal_ret__; \ + }) + +#define syswarn_ret(__ret__, format, ...) \ + ({ \ + typeof(__ret__) __internal_ret__ = (__ret__); \ + SYSWARN(format, ##__VA_ARGS__); \ + __internal_ret__; \ + }) + #define sysdebug(format, ...) \ ({ \ SYSDEBUG(format, ##__VA_ARGS__); \