padata: Use the online cpumask as the default

[linux-flexiantxendom0-3.2.10.git] / kernel / nsproxy.c

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index ac8a56e..b576f7f 100644 (file)
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -14,7 +14,7 @@
  */
 
 #include <linux/slab.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/nsproxy.h>
 #include <linux/init_task.h>
 #include <linux/mnt_namespace.h>
@@ -22,6 +22,9 @@
 #include <linux/pid_namespace.h>
 #include <net/net_namespace.h>
 #include <linux/ipc_namespace.h>
+#include <linux/proc_fs.h>
+#include <linux/file.h>
+#include <linux/syscalls.h>
 
 static struct kmem_cache *nsproxy_cachep;
 
@@ -75,16 +78,11 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
                goto out_uts;
        }
 
-       new_nsp->ipc_ns = copy_ipcs(flags, tsk->nsproxy->ipc_ns);
+       new_nsp->ipc_ns = copy_ipcs(flags, tsk);
        if (IS_ERR(new_nsp->ipc_ns)) {
                err = PTR_ERR(new_nsp->ipc_ns);
                goto out_ipc;
        }
-       if (new_nsp->ipc_ns != tsk->nsproxy->ipc_ns) {
-               put_user_ns(new_nsp->ipc_ns->user_ns);
-               new_nsp->ipc_ns->user_ns = task_cred_xxx(tsk, user)->user_ns;
-               get_user_ns(new_nsp->ipc_ns->user_ns);
-       }
 
        new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk));
        if (IS_ERR(new_nsp->pid_ns)) {
@@ -203,10 +201,6 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags,
                goto out;
        }
 
-       err = ns_cgroup_clone(current, task_pid(current));
-       if (err)
-               put_nsproxy(*new_nsp);
-
 out:
        return err;
 }
@@ -238,10 +232,47 @@ void exit_task_namespaces(struct task_struct *p)
        switch_task_namespaces(p, NULL);
 }
 
-static int __init nsproxy_cache_init(void)
+SYSCALL_DEFINE2(setns, int, fd, int, nstype)
+{
+       const struct proc_ns_operations *ops;
+       struct task_struct *tsk = current;
+       struct nsproxy *new_nsproxy;
+       struct proc_inode *ei;
+       struct file *file;
+       int err;
+
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
+       file = proc_ns_fget(fd);
+       if (IS_ERR(file))
+               return PTR_ERR(file);
+
+       err = -EINVAL;
+       ei = PROC_I(file->f_dentry->d_inode);
+       ops = ei->ns_ops;
+       if (nstype && (ops->type != nstype))
+               goto out;
+
+       new_nsproxy = create_new_namespaces(0, tsk, tsk->fs);
+       if (IS_ERR(new_nsproxy)) {
+               err = PTR_ERR(new_nsproxy);
+               goto out;
+       }
+
+       err = ops->install(new_nsproxy, ei->ns);
+       if (err) {
+               free_nsproxy(new_nsproxy);
+               goto out;
+       }
+       switch_task_namespaces(tsk, new_nsproxy);
+out:
+       fput(file);
+       return err;
+}
+
+int __init nsproxy_cache_init(void)
 {
        nsproxy_cachep = KMEM_CACHE(nsproxy, SLAB_PANIC);
        return 0;
 }
-
-module_init(nsproxy_cache_init);