Merge to Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.13-vs2...

[linux-2.6.git] / kernel / vserver / namespace.c

diff --git a/kernel/vserver/namespace.c b/kernel/vserver/namespace.c
index ee60d4b..2c46f98 100644 (file)
--- a/kernel/vserver/namespace.c
+++ b/kernel/vserver/namespace.c
@@ -3,143 +3,26 @@
  *
  *  Virtual Server: Context Namespace Support
  *
- *  Copyright (C) 2003-2004  Herbert Pötzl
+ *  Copyright (C) 2003-2005  Herbert Pötzl
  *
  *  V0.01  broken out from context.c 0.07
  *  V0.02  added task locking for namespace
  *
  */
 
-#include <linux/config.h>
 #include <linux/utsname.h>
-#include <linux/vserver/namespace.h>
-#include <linux/vs_base.h>
+#include <linux/sched.h>
 #include <linux/vs_context.h>
-#include <linux/namespace.h>
+#include <linux/vserver/namespace.h>
+#include <linux/vserver/namespace_cmd.h>
 #include <linux/dcache.h>
+#include <linux/mount.h>
 #include <linux/fs.h>
 
 #include <asm/errno.h>
 #include <asm/uaccess.h>
 
 
-int vx_check_vfsmount(struct vx_info *vxi, struct vfsmount *mnt)
-{
-       struct vfsmount *root_mnt, *altroot_mnt;
-       struct dentry *root, *altroot, *point;
-       int r1, r2, s1, s2, ret = 0;
-
-       if (!vxi || !mnt)
-               return 1;
-
-       spin_lock(&dcache_lock);
-       altroot_mnt = current->fs->rootmnt;
-       altroot = current->fs->root;
-       point = altroot;
-
-       if (vxi->vx_fs) {
-               root_mnt = vxi->vx_fs->rootmnt;
-               root = vxi->vx_fs->root;
-       } else {
-               root_mnt = altroot_mnt;
-               root = altroot;
-       }
-       /* printk("··· %p:%p/%p:%p ",
-               root_mnt, root, altroot_mnt, altroot);  */
-
-       while ((mnt != mnt->mnt_parent) &&
-               (mnt != root_mnt) && (mnt != altroot_mnt)) {
-               point = mnt->mnt_mountpoint;
-               mnt = mnt->mnt_parent;
-       }
-
-       r1 = (mnt == root_mnt);
-       s1 = is_subdir(point, root);
-       r2 = (mnt == altroot_mnt);
-       s2 = is_subdir(point, altroot);
-
-       ret = (((mnt == root_mnt) && is_subdir(point, root)) ||
-               ((mnt == altroot_mnt) && is_subdir(point, altroot)));
-       /* printk("··· for %p:%p -> %d:%d/%d:%d = %d\n",
-               mnt, point, r1, s1, r2, s2, ret);       */
-       spin_unlock(&dcache_lock);
-
-       return (r2 && s2);
-}
-
-
-/* virtual host info names */
-
-static char * vx_vhi_name(struct vx_info *vxi, int id)
-{
-       switch (id) {
-               case VHIN_CONTEXT:
-                       return vxi->vx_name;
-               case VHIN_SYSNAME:
-                       return vxi->cvirt.utsname.sysname;
-               case VHIN_NODENAME:
-                       return vxi->cvirt.utsname.nodename;
-               case VHIN_RELEASE:
-                       return vxi->cvirt.utsname.release;
-               case VHIN_VERSION:
-                       return vxi->cvirt.utsname.version;
-               case VHIN_MACHINE:
-                       return vxi->cvirt.utsname.machine;
-               case VHIN_DOMAINNAME:
-                       return vxi->cvirt.utsname.domainname;
-               default:
-                       return NULL;
-       }
-       return NULL;
-}
-
-int vc_set_vhi_name(uint32_t id, void __user *data)
-{
-       struct vx_info *vxi;
-       struct vcmd_vx_vhi_name_v0 vc_data;
-       char *name;
-
-       if (!capable(CAP_SYS_ADMIN))
-               return -EPERM;
-       if (copy_from_user (&vc_data, data, sizeof(vc_data)))
-               return -EFAULT;
-
-       vxi = locate_vx_info(id);
-       if (!vxi)
-               return -ESRCH;
-
-       name = vx_vhi_name(vxi, vc_data.field);
-       if (name)
-               memcpy(name, vc_data.name, 65);
-       put_vx_info(vxi);
-       return (name ? 0 : -EFAULT);
-}
-
-int vc_get_vhi_name(uint32_t id, void __user *data)
-{
-       struct vx_info *vxi;
-       struct vcmd_vx_vhi_name_v0 vc_data;
-       char *name;
-
-       if (copy_from_user (&vc_data, data, sizeof(vc_data)))
-               return -EFAULT;
-
-       vxi = locate_vx_info(id);
-       if (!vxi)
-               return -ESRCH;
-
-       name = vx_vhi_name(vxi, vc_data.field);
-       if (!name)
-               goto out_put;
-
-       memcpy(vc_data.name, name, 65);
-       if (copy_to_user (data, &vc_data, sizeof(vc_data)))
-               return -EFAULT;
-out_put:
-       put_vx_info(vxi);
-       return (name ? 0 : -EFAULT);
-}
-
 /* namespace functions */
 
 #include <linux/namespace.h>
@@ -163,7 +46,7 @@ int vx_set_namespace(struct vx_info *vxi, struct namespace *ns, struct fs_struct
        return 0;
 }
 
-int vc_enter_namespace(uint32_t id, void *data)
+int vc_enter_namespace(uint32_t id, void __user *data)
 {
        struct vx_info *vxi;
        struct fs_struct *old_fs, *fs;
@@ -173,7 +56,7 @@ int vc_enter_namespace(uint32_t id, void *data)
        if (!vx_check(0, VX_ADMIN))
                return -ENOSYS;
 
-       vxi = locate_vx_info(id);
+       vxi = lookup_vx_info(id);
        if (!vxi)
                return -ESRCH;
 
@@ -202,16 +85,6 @@ out_put:
        return ret;
 }
 
-int vc_cleanup_namespace(uint32_t id, void *data)
-{
-       down_write(&current->namespace->sem);
-       spin_lock(&vfsmount_lock);
-       umount_unused(current->namespace->root, current->fs);
-       spin_unlock(&vfsmount_lock);
-       up_write(&current->namespace->sem);
-       return 0;
-}
-
 int vc_set_namespace(uint32_t id, void __user *data)
 {
        struct fs_struct *fs;
@@ -219,11 +92,11 @@ int vc_set_namespace(uint32_t id, void __user *data)
        struct vx_info *vxi;
        int ret;
 
-       if (vx_check(0, VX_ADMIN|VX_WATCH))
-               return -ENOSYS;
+       vxi = lookup_vx_info(id);
+       if (!vxi)
+               return -ESRCH;
 
        task_lock(current);
-       vxi = get_vx_info(current->vx_info);
        fs = current->fs;
        atomic_inc(&fs->count);
        ns = current->namespace;