From 77ecb6ab49257dd662aa9c461fed3dc1d74e5092 Mon Sep 17 00:00:00 2001 From: Tiago Natel de Moura Date: Wed, 16 Sep 2020 17:52:53 +0100 Subject: [PATCH] Isolation: remove redundant macro. --- src/nxt_clone.h | 3 --- src/nxt_isolation.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/nxt_clone.h b/src/nxt_clone.h index e89fd82d..c2066ce6 100644 --- a/src/nxt_clone.h +++ b/src/nxt_clone.h @@ -42,9 +42,6 @@ pid_t nxt_clone(nxt_int_t flags); #if (NXT_HAVE_CLONE_NEWUSER) -#define NXT_CLONE_MNT(flags) \ - ((flags & CLONE_NEWNS) == CLONE_NEWNS) - NXT_EXPORT nxt_int_t nxt_clone_credential_map(nxt_task_t *task, pid_t pid, nxt_credential_t *creds, nxt_clone_t *clone); NXT_EXPORT nxt_int_t nxt_clone_vldt_credential_uidmap(nxt_task_t *task, diff --git a/src/nxt_isolation.c b/src/nxt_isolation.c index a497b729..0ff63e50 100644 --- a/src/nxt_isolation.c +++ b/src/nxt_isolation.c @@ -707,7 +707,7 @@ nxt_isolation_change_root(nxt_task_t *task, nxt_process_t *process) nxt_debug(task, "change root: %s", rootfs); - if (NXT_CLONE_MNT(process->isolation.clone.flags)) { + if (nxt_is_clone_flag_set(process->isolation.clone.flags, NEWNS)) { ret = nxt_isolation_pivot_root(task, rootfs); } else {