X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fkernel%2Fcontext.h;h=ed1145eb39f0a8f44742751f1c71158701695733;hb=faa778968d1a7dfeaebc9fe4b847e691dc62fd15;hp=a5a77e0c9a5cc5c3028fda41754efe7b09da3185;hpb=e2b438b1ed77a421ec45a2a63f12a08636f57ace;p=util-vserver.git diff --git a/util-vserver/kernel/context.h b/util-vserver/kernel/context.h index a5a77e0..ed1145e 100644 --- a/util-vserver/kernel/context.h +++ b/util-vserver/kernel/context.h @@ -36,6 +36,8 @@ #define VXF_STATE_SETUP (1ULL<<32) #define VXF_STATE_INIT (1ULL<<33) +#define VXF_STATE_HELPER (1ULL<<36) + #define VXF_FORK_RSS (1ULL<<48) #define VXF_PROLIFIC (1ULL<<49) @@ -43,10 +45,12 @@ #define VXF_ONE_TIME (0x0003ULL<<32) +#define VXF_INIT_SET (VXF_STATE_SETUP|VXF_STATE_INIT) + /* context caps */ -#define VXC_CAP_MASK 0x00000000 +#define VXC_CAP_MASK 0x00000000 #define VXC_SET_UTSNAME 0x00000001 #define VXC_SET_RLIMIT 0x00000002 @@ -66,6 +70,9 @@ enum { VSC_STARTUP = 1, VSC_SHUTDOWN, + + VSC_NETUP, + VSC_NETDOWN, }; @@ -81,7 +88,6 @@ enum { struct vx_info { struct hlist_node vx_hlist; /* linked list of contexts */ - struct rcu_head vx_rcu; /* the rcu head */ xid_t vx_id; /* context id */ atomic_t vx_usecnt; /* usage count */ atomic_t vx_tasks; /* tasks count */ @@ -96,7 +102,6 @@ struct vx_info { pid_t vx_initpid; /* PID of fake init process */ - spinlock_t vx_lock; wait_queue_head_t vx_wait; /* context exit waitqueue */ struct _vx_limit limit; /* vserver limits */ @@ -114,7 +119,6 @@ struct vx_info { #define VXS_PAUSED 0x0010 #define VXS_ONHOLD 0x0020 #define VXS_SHUTDOWN 0x0100 -#define VXS_DEFUNCT 0x1000 #define VXS_RELEASED 0x8000 /* check conditions */ @@ -150,8 +154,6 @@ extern int vx_migrate_task(struct task_struct *, struct vx_info *); extern long vs_state_change(struct vx_info *, unsigned int); -extern void free_vx_info(struct vx_info *); - #endif /* __KERNEL__ */ #else /* _VX_CONTEXT_H */