upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/kernel/vserver/legacy.c b/kernel/vserver/legacy.c
index fe4c66d..73efdaa 100644 (file)
--- a/kernel/vserver/legacy.c
+++ b/kernel/vserver/legacy.c
@@ -4,7 +4,7 @@
  *  Virtual Server: Legacy Funtions
  *
  *  Copyright (C) 2001-2003  Jacques Gelinas
- *  Copyright (C) 2003-2004  Herbert Pötzl
+ *  Copyright (C) 2003-2005  Herbert Pötzl
  *
  *  V0.01  broken out from vcontext.c V0.05
  *
@@ -52,7 +52,6 @@ int vc_new_s_context(uint32_t ctx, void __user *data)
                if (ret == 0) {
                        /* We keep the same vx_id, but lower the capabilities */
                        current->vx_info->vx_bcaps &= (~vc_data.remove_cap);
-                       // current->cap_bset &= (~vc_data.remove_cap);
                        ret = vx_current_xid();
                        current->vx_info->vx_flags |= vc_data.flags;
                }
@@ -92,7 +91,6 @@ int vc_new_s_context(uint32_t ctx, void __user *data)
        ret = vx_migrate_task(current, new_vxi);
        if (ret == 0) {
                current->vx_info->vx_bcaps &= (~vc_data.remove_cap);
-               // current->cap_bset &= (~vc_data.remove_cap);
                new_vxi->vx_flags |= vc_data.flags;
                if (vc_data.flags & VX_INFO_INIT)
                        vx_set_initpid(new_vxi, current->tgid);
@@ -109,68 +107,3 @@ out_put:
        return ret;
 }
 
-
-extern struct nx_info *create_nx_info(void);
-
-/*  set ipv4 root (syscall) */
-
-int vc_set_ipv4root(uint32_t nbip, void __user *data)
-{
-       int i, err = -EPERM;
-       struct vcmd_set_ipv4root_v3 vc_data;
-       struct nx_info *new_nxi, *nxi = current->nx_info;
-
-       if (nbip < 0 || nbip > NB_IPV4ROOT)
-               return -EINVAL;
-       if (copy_from_user (&vc_data, data, sizeof(vc_data)))
-               return -EFAULT;
-
-       if (!nxi || nxi->ipv4[0] == 0 || capable(CAP_NET_ADMIN))
-               // We are allowed to change everything
-               err = 0;
-       else if (nxi) {
-               int found = 0;
-
-               // We are allowed to select a subset of the currently
-               // installed IP numbers. No new one allowed
-               // We can't change the broadcast address though
-               for (i=0; i<nbip; i++) {
-                       int j;
-                       __u32 nxip = vc_data.nx_mask_pair[i].ip;
-                       for (j=0; j<nxi->nbipv4; j++) {
-                               if (nxip == nxi->ipv4[j]) {
-                                       found++;
-                                       break;
-                               }
-                       }
-               }
-               if ((found == nbip) &&
-                       (vc_data.broadcast == nxi->v4_bcast))
-                       err = 0;
-       }
-       if (err)
-               return err;
-
-       new_nxi = create_nx_info();
-       if (!new_nxi)
-               return -EINVAL;
-
-       new_nxi->nbipv4 = nbip;
-       for (i=0; i<nbip; i++) {
-               new_nxi->ipv4[i] = vc_data.nx_mask_pair[i].ip;
-               new_nxi->mask[i] = vc_data.nx_mask_pair[i].mask;
-       }
-       new_nxi->v4_bcast = vc_data.broadcast;
-       // current->nx_info = new_nxi;
-       if (nxi) {
-               printk("!!! switching nx_info %p->%p\n", nxi, new_nxi);
-               clr_nx_info(&current->nx_info);
-       }
-       nx_migrate_task(current, new_nxi);
-       // set_nx_info(&current->nx_info, new_nxi);
-       // current->nid = new_nxi->nx_id;
-       put_nx_info(new_nxi);
-       return 0;
-}
-
-