vserver 1.9.3

[linux-2.6.git] / include / linux / vserver / context.h

diff --git a/include/linux/vserver/context.h b/include/linux/vserver/context.h
index 434bfba..4061e7b 100644 (file)
--- a/include/linux/vserver/context.h
+++ b/include/linux/vserver/context.h
@@ -27,15 +27,19 @@ struct vx_info {
        atomic_t vx_usecnt;                     /* usage count */
        atomic_t vx_refcnt;                     /* reference count */
        struct vx_info *vx_parent;              /* parent context */
+       int vx_state;                           /* context state */
 
        struct namespace *vx_namespace;         /* private namespace */
        struct fs_struct *vx_fs;                /* private namespace fs */
-       uint64_t vx_flags;                      /* VX_INFO_xxx */
+       uint64_t vx_flags;                      /* context flags */
        uint64_t vx_bcaps;                      /* bounding caps (system) */
        uint64_t vx_ccaps;                      /* context caps (vserver) */
 
        pid_t vx_initpid;                       /* PID of fake init process */
 
+       spinlock_t vx_lock;
+       wait_queue_head_t vx_exit;              /* context exit waitqueue */
+
        struct _vx_limit limit;                 /* vserver limits */
        struct _vx_sched sched;                 /* vserver scheduler */
        struct _vx_cvirt cvirt;                 /* virtual/bias stuff */
@@ -44,6 +48,16 @@ struct vx_info {
        char vx_name[65];                       /* vserver name */
 };
 
+/* status flags */
+
+#define VXS_HASHED     0x0001
+#define VXS_PAUSED     0x0010
+#define VXS_ONHOLD     0x0020
+#define VXS_SHUTDOWN   0x0100
+#define VXS_DEFUNCT    0x1000
+#define VXS_RELEASED   0x8000
+
+/* check conditions */
 
 #define VX_ADMIN       0x0001
 #define VX_WATCH       0x0002
@@ -64,7 +78,7 @@ struct vx_info {
 
 struct rcu_head;
 
-extern void rcu_free_vx_info(struct rcu_head *);
+// extern void rcu_free_vx_info(struct rcu_head *);
 extern void unhash_vx_info(struct vx_info *);
 
 extern struct vx_info *locate_vx_info(int);
@@ -92,10 +106,10 @@ extern int vc_task_xid(uint32_t, void __user *);
 #define VCMD_vx_info           VC_CMD(VINFO, 5, 0)
 #define VCMD_nx_info           VC_CMD(VINFO, 6, 0)
 
-struct  vcmd_vx_info_v0 {
+struct vcmd_vx_info_v0 {
        uint32_t xid;
        uint32_t initpid;
-       /* more to come */      
+       /* more to come */
 };
 
 #ifdef __KERNEL__
@@ -115,7 +129,7 @@ extern int vc_ctx_migrate(uint32_t, void __user *);
 #define VCMD_get_cflags                VC_CMD(FLAGS, 1, 0)
 #define VCMD_set_cflags                VC_CMD(FLAGS, 2, 0)
 
-struct  vcmd_ctx_flags_v0 {
+struct vcmd_ctx_flags_v0 {
        uint64_t flagword;
        uint64_t mask;
 };
@@ -143,6 +157,7 @@ extern int vc_set_cflags(uint32_t, void __user *);
 #define VXF_VIRT_MEM           0x00010000
 #define VXF_VIRT_UPTIME                0x00020000
 #define VXF_VIRT_CPU           0x00040000
+#define VXF_VIRT_LOAD          0x00080000
 
 #define VXF_HIDE_MOUNT         0x01000000
 #define VXF_HIDE_NETIF         0x02000000
@@ -150,15 +165,17 @@ extern int vc_set_cflags(uint32_t, void __user *);
 #define VXF_STATE_SETUP                (1ULL<<32)
 #define VXF_STATE_INIT         (1ULL<<33)
 
-#define        VXF_FORK_RSS            (1ULL<<48)
-#define        VXF_PROLIFIC            (1ULL<<49)
+#define VXF_FORK_RSS           (1ULL<<48)
+#define VXF_PROLIFIC           (1ULL<<49)
+
+#define VXF_IGNEG_NICE         (1ULL<<52)
 
 #define VXF_ONE_TIME           (0x0003ULL<<32)
 
 #define VCMD_get_ccaps         VC_CMD(FLAGS, 3, 0)
 #define VCMD_set_ccaps         VC_CMD(FLAGS, 4, 0)
 
-struct  vcmd_ctx_caps_v0 {
+struct vcmd_ctx_caps_v0 {
        uint64_t bcaps;
        uint64_t ccaps;
        uint64_t cmask;
@@ -176,6 +193,7 @@ extern int vc_set_ccaps(uint32_t, void __user *);
 #define VXC_RAW_ICMP           0x00000100
 
 #define VXC_SECURE_MOUNT       0x00010000
+#define VXC_SECURE_REMOUNT     0x00020000
 
 
 #endif /* _VX_CONTEXT_H */