Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/include/linux/vserver/context.h b/include/linux/vserver/context.h
index a5a77e0..816b8a2 100644 (file)
--- a/include/linux/vserver/context.h
+++ b/include/linux/vserver/context.h
@@ -36,6 +36,10 @@
 #define VXF_STATE_SETUP                (1ULL<<32)
 #define VXF_STATE_INIT         (1ULL<<33)
 
+#define VXF_SC_HELPER          (1ULL<<36)
+#define VXF_REBOOT_KILL                (1ULL<<37)
+#define VXF_PERSISTENT         (1ULL<<38)
+
 #define VXF_FORK_RSS           (1ULL<<48)
 #define VXF_PROLIFIC           (1ULL<<49)
 
@@ -43,10 +47,17 @@
 
 #define VXF_ONE_TIME           (0x0003ULL<<32)
 
+#define VXF_INIT_SET           (VXF_STATE_SETUP|VXF_STATE_INIT)
+
+
+/* context migration */
+
+#define VXM_SET_INIT           0x00000001
+#define VXM_SET_REAPER         0x00000002
 
 /* context caps */
 
-#define        VXC_CAP_MASK            0x00000000
+#define VXC_CAP_MASK           0x00000000
 
 #define VXC_SET_UTSNAME                0x00000001
 #define VXC_SET_RLIMIT         0x00000002
@@ -66,6 +77,9 @@
 enum {
        VSC_STARTUP = 1,
        VSC_SHUTDOWN,
+
+       VSC_NETUP,
+       VSC_NETDOWN,
 };
 
 
@@ -81,7 +95,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 */
@@ -94,16 +107,18 @@ struct vx_info {
        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_wait;              /* context exit waitqueue */
+       struct task_struct *vx_reaper;          /* guest reaper process */
+       pid_t vx_initpid;                       /* PID of guest init */
 
        struct _vx_limit limit;                 /* vserver limits */
        struct _vx_sched sched;                 /* vserver scheduler */
        struct _vx_cvirt cvirt;                 /* virtual/bias stuff */
        struct _vx_cacct cacct;                 /* context accounting */
 
+       wait_queue_head_t vx_wait;              /* context exit waitqueue */
+       int reboot_cmd;                         /* last sys_reboot() cmd */
+       int exit_code;                          /* last process exit code */
+
        char vx_name[65];                       /* vserver name */
 };
 
@@ -114,7 +129,7 @@ struct vx_info {
 #define VXS_PAUSED     0x0010
 #define VXS_ONHOLD     0x0020
 #define VXS_SHUTDOWN   0x0100
-#define VXS_DEFUNCT    0x1000
+#define VXS_HELPER     0x1000
 #define VXS_RELEASED   0x8000
 
 /* check conditions */
@@ -140,8 +155,8 @@ struct vx_info {
 extern void claim_vx_info(struct vx_info *, struct task_struct *);
 extern void release_vx_info(struct vx_info *, struct task_struct *);
 
-extern struct vx_info *locate_vx_info(int);
-extern struct vx_info *locate_or_create_vx_info(int);
+extern struct vx_info *lookup_vx_info(int);
+extern struct vx_info *lookup_or_create_vx_info(int);
 
 extern int get_xid_list(int, unsigned int *, int);
 extern int xid_is_hashed(xid_t);
@@ -150,8 +165,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 */