From 7e23bcd6467ae9ffd388f888dc2ff288cd4eda2f Mon Sep 17 00:00:00 2001
From: David Bigagli <david@schedmd.com>
Date: Tue, 15 Dec 2015 09:23:43 +0100
Subject: [PATCH] Revert "Avoiding conditional directives that break
statements"
This reverts commit 76098daff5bec8307a4bc0dd329d81da6d94dd2f.
---
src/slurmd/common/xcgroup.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/slurmd/common/xcgroup.c b/src/slurmd/common/xcgroup.c
index 9562d59432a..77abdfb0ee8 100644
--- a/src/slurmd/common/xcgroup.c
+++ b/src/slurmd/common/xcgroup.c
@@ -218,11 +218,12 @@ int xcgroup_ns_mount(xcgroup_ns_t* cgns)
}
#if defined(__FreeBSD__)
- #define mount_group mount("cgroup", cgns->mnt_point, MS_NOSUID|MS_NOEXEC|MS_NODEV, options)
+ if (mount("cgroup", cgns->mnt_point,
+ MS_NOSUID|MS_NOEXEC|MS_NODEV, options))
#else
- #define mount_group mount("cgroup", cgns->mnt_point, "cgroup", MS_NOSUID|MS_NOEXEC|MS_NODEV, options)
+ if (mount("cgroup", cgns->mnt_point, "cgroup",
+ MS_NOSUID|MS_NOEXEC|MS_NODEV, options))
#endif
- if (mount_group)
return XCGROUP_ERROR;
else {
/* FIXME: this only gets set when we aren't mounted at
--
GitLab