conf: use lxc_log_trace()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

conf: use lxc_log_trace()
eb30db66 · Christian Brauner · 639428eb · eb30db66
Unverified Commit eb30db66 authored Feb 01, 2021 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

conf.c src/lxc/conf.c +4 -8

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -4104,8 +4104,7 @@ int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *), void *data,
 	close_prot_errno_disarm(pipe_fds[0]);
-	if (lxc_log_get_level() == LXC_LOG_LEVEL_TRACE ||
+	if (lxc_log_trace()) {
-	    conf->loglevel == LXC_LOG_LEVEL_TRACE) {
 		struct id_map *map;
 		struct lxc_list *it;
@@ -4219,8 +4218,7 @@ int userns_exec_minimal(const struct lxc_conf *conf,
 	close_prot_errno_disarm(sock_fds[0]);
-	if (lxc_log_get_level() == LXC_LOG_LEVEL_TRACE ||
+	if (lxc_log_trace()) {
-	    conf->loglevel == LXC_LOG_LEVEL_TRACE) {
 		struct id_map *map;
 		struct lxc_list *it;
@@ -4404,8 +4402,7 @@ int userns_exec_full(struct lxc_conf *conf, int (*fn)(void *), void *data,
 	/* idmap will now keep track of that memory. */
 	host_gid_map = NULL;
-	if (lxc_log_get_level() == LXC_LOG_LEVEL_TRACE ||
+	if (lxc_log_trace()) {
-	    conf->loglevel == LXC_LOG_LEVEL_TRACE) {
 		lxc_list_for_each (cur, idmap) {
 			map = cur->elem;
 			TRACE("establishing %cid mapping for \"%d\" in new "
@@ -4626,8 +4623,7 @@ int userns_exec_mapped_root(const char *path, int path_fd,
 	close_prot_errno_disarm(sock_fds[0]);
-	if (lxc_log_get_level() == LXC_LOG_LEVEL_TRACE ||
+	if (lxc_log_trace()) {
-	    conf->loglevel == LXC_LOG_LEVEL_TRACE) {
 		struct id_map *map;
 		struct lxc_list *it;