just re-order

[lxc-userspace.git] / setns.c

diff --git a/setns.c b/setns.c
index 7d82d53..e562cd6 100644 (file)
--- a/setns.c
+++ b/setns.c
@@ -1,9 +1,28 @@
 #include <Python.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <asm-generic/unistd.h>
+#include <asm/unistd.h>
 #include <sys/mount.h>
 
+static PyObject *
+proc_mount(PyObject *self, PyObject *args)
+{
+    int sts; 
+    sts = mount("none","/proc","proc",0,NULL);
+
+    return Py_BuildValue("i", sts);
+}
+
+static PyObject *
+proc_umount(PyObject *self, PyObject *args)
+{
+    int sts; 
+    sts = umount("/proc");
+
+    return Py_BuildValue("i", sts);
+
+}
+
 static PyObject *
 chfscontext(PyObject *self, PyObject *args)
 {
@@ -15,12 +34,11 @@ chfscontext(PyObject *self, PyObject *args)
 
     int fd = open(filepath, O_RDONLY);
     if (fd < 0) {
-           //printf("Could not open ns file\n");
         sts = -1;
         goto out;
     }
     
-    if (setns(fd, 666)) {
+    if (setns(fd, 0)) {
         sts = -1;
     }
     close(fd);
@@ -29,25 +47,6 @@ out:
     return Py_BuildValue("i", sts);
 }
 
-static PyObject *
-proc_mount(PyObject *self, PyObject *args)
-{
-    int sts; 
-    sts = mount("none","/proc","proc",0,NULL);
-
-    return Py_BuildValue("i", sts);
-}
-
-static PyObject *
-proc_umount(PyObject *self, PyObject *args)
-{
-    int sts; 
-    sts = umount("/proc");
-
-    return Py_BuildValue("i", sts);
-
-}
-
 static PyObject *
 chcontext(PyObject *self, PyObject *args)
 {
@@ -59,7 +58,6 @@ chcontext(PyObject *self, PyObject *args)
 
     int fd = open(filepath, O_RDONLY);
     if (fd < 0) {
-//     printf("Could not open ns file\n");
         sts = -1;
         goto out;
     }