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=2cc82388e83ff8d51b1f4db6b47a03a5b75e3a1f;hpb=77d302326fbb2bc08b55f228627f83f2be1dbc0b;p=util-vserver.git diff --git a/util-vserver/kernel/context.h b/util-vserver/kernel/context.h index 2cc8238..ed1145e 100644 --- a/util-vserver/kernel/context.h +++ b/util-vserver/kernel/context.h @@ -36,8 +36,7 @@ #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_STATE_HELPER (1ULL<<36) #define VXF_FORK_RSS (1ULL<<48) #define VXF_PROLIFIC (1ULL<<49) @@ -51,7 +50,7 @@ /* context caps */ -#define VXC_CAP_MASK 0x00000000 +#define VXC_CAP_MASK 0x00000000 #define VXC_SET_UTSNAME 0x00000001 #define VXC_SET_RLIMIT 0x00000002 @@ -113,11 +112,6 @@ struct vx_info { char vx_name[65]; /* vserver name */ }; -struct vx_info_save { - struct vx_info *vxi; - xid_t xid; -}; - /* status flags */ @@ -150,8 +144,8 @@ struct vx_info_save { 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 *lookup_vx_info(int); -extern struct vx_info *lookup_or_create_vx_info(int); +extern struct vx_info *locate_vx_info(int); +extern struct vx_info *locate_or_create_vx_info(int); extern int get_xid_list(int, unsigned int *, int); extern int xid_is_hashed(xid_t);