log: add lxc_log_trace() helper

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
lxc · Jan 30, 2021 · de96cd6 · de96cd6
1 parent 4a888de
commit de96cd6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/lxc/cgroups/cgroup2_devices.c b/src/lxc/cgroups/cgroup2_devices.c
@@ -331,7 +331,7 @@ static int bpf_program_load_kernel(struct bpf_program *prog)
 	if (prog->kernel_fd >= 0)
 		return 0;
 
-	if (lxc_log_get_level() <= LXC_LOG_LEVEL_TRACE) {
+	if (lxc_log_trace()) {
 		log_buf = zalloc(BPF_LOG_BUF_SIZE);
 		if (!log_buf) {
 			WARN("Failed to allocate bpf log buffer");

diff --git a/src/lxc/log.h b/src/lxc/log.h
@@ -568,6 +568,10 @@ __hidden extern void lxc_log_syslog_enable(void);
 __hidden extern void lxc_log_syslog_disable(void);
 __hidden extern int lxc_log_set_level(int *dest, int level);
 __hidden extern int lxc_log_get_level(void);
+static inline bool lxc_log_trace(void)
+{
+	return lxc_log_get_level() <= LXC_LOG_LEVEL_TRACE;
+}
 __hidden extern bool lxc_log_has_valid_level(void);
 __hidden extern int lxc_log_set_file(int *fd, const char *fname);
 __hidden extern const char *lxc_log_get_file(void);

diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
@@ -1260,7 +1260,7 @@ int lxc_seccomp_load(struct lxc_conf *conf)
 /* After load seccomp filter into the kernel successfully, export the current seccomp
  * filter to log file */
 #if HAVE_SCMP_FILTER_CTX
-	if (lxc_log_get_level() <= LXC_LOG_LEVEL_TRACE) {
+	if (lxc_log_trace()) {
 		int fd_log;
 
 		fd_log = lxc_log_get_fd();