ns: Move all CLONE_FOO into namespaces.h

This removes double declaration of CLONE_NEWCGROUP. Also -- removes
re-declaration of the CLONE_ALLNS in pstree.c.

Tycho, the two CLONE_ALLNS-s we had differ from each other :) The one
in pstree.c doesn't have CLONE_NEWCGROUP. I believe this was just a
misprint :) tests seem to pass.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Acked-by: Tycho Andersen <tycho.andersen@canonical.com>

criu/include/namespaces.h

@@ -4,12 +4,36 @@
 #include "compiler.h"
 #include "files.h"
 
-/* including syscall-types.h gives another weird error; do we really need to
- * define this twice? */
+#ifndef CLONE_NEWNS
+#define CLONE_NEWNS	0x00020000
+#endif
+
+#ifndef CLONE_NEWPID
+#define CLONE_NEWPID	0x20000000
+#endif
+
+#ifndef CLONE_NEWUTS
+#define CLONE_NEWUTS	0x04000000
+#endif
+
+#ifndef CLONE_NEWIPC
+#define CLONE_NEWIPC	0x08000000
+#endif
+
+#ifndef CLONE_NEWNET
+#define CLONE_NEWNET	0x40000000
+#endif
+
+#ifndef CLONE_NEWUSER
+#define CLONE_NEWUSER	0x10000000
+#endif
+
 #ifndef CLONE_NEWCGROUP
 #define CLONE_NEWCGROUP	0x02000000
 #endif
 
+#define CLONE_ALLNS	(CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC | CLONE_NEWUTS | CLONE_NEWNS | CLONE_NEWUSER | CLONE_NEWCGROUP)
+
 /* Nested namespaces are supported only for these types */
 #define CLONE_SUBNS	(CLONE_NEWNS)
 

criu/include/syscall-types.h

@@ -42,36 +42,6 @@ struct itimerspec;
 #define F_GETFD 1
 #endif
 
-#ifndef CLONE_NEWNS
-#define CLONE_NEWNS	0x00020000
-#endif
-
-#ifndef CLONE_NEWPID
-#define CLONE_NEWPID	0x20000000
-#endif
-
-#ifndef CLONE_NEWUTS
-#define CLONE_NEWUTS	0x04000000
-#endif
-
-#ifndef CLONE_NEWIPC
-#define CLONE_NEWIPC	0x08000000
-#endif
-
-#ifndef CLONE_NEWNET
-#define CLONE_NEWNET	0x40000000
-#endif
-
-#ifndef CLONE_NEWUSER
-#define CLONE_NEWUSER	0x10000000
-#endif
-
-#ifndef CLONE_NEWCGROUP
-#define CLONE_NEWCGROUP	0x02000000
-#endif
-
-#define CLONE_ALLNS	(CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC | CLONE_NEWUTS | CLONE_NEWNS | CLONE_NEWUSER | CLONE_NEWCGROUP)
-
 struct krlimit {
 	unsigned long rlim_cur;
 	unsigned long rlim_max;

criu/pstree.c

@@ -18,8 +18,6 @@
 
 struct pstree_item *root_item;
 
-#define CLONE_ALLNS     (CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC | CLONE_NEWUTS | CLONE_NEWNS | CLONE_NEWUSER)
-
 void core_entry_free(CoreEntry *core)
 {
 	if (core->tc && core->tc->timers)