From: Enrico Scholz Date: Fri, 15 Jul 2005 16:25:01 +0000 (+0000) Subject: updated to patch-2.6.12.2-vs2.0-rc7 X-Git-Tag: version_0_30_210~136 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08ccd5e2ac100d61e56d472f2895900efc1b3966;p=util-vserver.git updated to patch-2.6.12.2-vs2.0-rc7 git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2145 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/kernel/network.h b/util-vserver/kernel/network.h index f475b3f..29c5bd2 100644 --- a/util-vserver/kernel/network.h +++ b/util-vserver/kernel/network.h @@ -11,15 +11,27 @@ #define NB_IPV4ROOT 16 -/* context flags */ +/* network flags */ #define NXF_STATE_SETUP (1ULL<<32) #define NXF_STATE_HELPER (1ULL<<36) +#define NXF_ONE_TIME (0x0001ULL<<32) + #define NXF_INIT_SET (0) +/* address types */ + +#define NXA_TYPE_IPV4 1 +#define NXA_TYPE_IPV6 2 + +#define NXA_MOD_BCAST (1<<8) + +#define NXA_TYPE_ANY (~0) + + #ifdef __KERNEL__ #include diff --git a/util-vserver/kernel/network_cmd.h b/util-vserver/kernel/network_cmd.h index d23961e..d9802fe 100644 --- a/util-vserver/kernel/network_cmd.h +++ b/util-vserver/kernel/network_cmd.h @@ -35,7 +35,7 @@ struct vcmd_net_create { #define VCMD_net_add VC_CMD(NETALT, 1, 0) #define VCMD_net_remove VC_CMD(NETALT, 2, 0) -struct vcmd_net_nx_v0 { +struct vcmd_net_addr_v0 { uint16_t type; uint16_t count; uint32_t ip[4]; @@ -48,8 +48,14 @@ struct vcmd_net_nx_v0 { extern int vc_net_create(uint32_t, void __user *); extern int vc_net_migrate(uint32_t, void __user *); +extern int vc_net_add(uint32_t, void __user *); +extern int vc_net_remove(uint32_t, void __user *); + #endif /* __KERNEL__ */ + +/* flag commands */ + #define VCMD_get_nflags VC_CMD(FLAGS, 5, 0) #define VCMD_set_nflags VC_CMD(FLAGS, 6, 0) @@ -64,9 +70,8 @@ extern int vc_set_nflags(uint32_t, void __user *); #endif /* __KERNEL__ */ -#define IPF_STATE_SETUP (1ULL<<32) -#define IPF_ONE_TIME (0x0001ULL<<32) +/* network caps commands */ #define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0) #define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0) diff --git a/util-vserver/kernel/switch.h b/util-vserver/kernel/switch.h index 36b09c4..0c7fddb 100644 --- a/util-vserver/kernel/switch.h +++ b/util-vserver/kernel/switch.h @@ -78,7 +78,7 @@ /* interface version */ #define VCI_VERSION 0x00020001 - +#define VCI_LEGACY_VERSION 0x000100FF /* query version */ diff --git a/util-vserver/kernel/xid.h b/util-vserver/kernel/xid.h index c1994c0..4848951 100644 --- a/util-vserver/kernel/xid.h +++ b/util-vserver/kernel/xid.h @@ -5,9 +5,12 @@ #warning config options missing #endif +#define XID_TAG_SB(sb) (sb->s_flags & MS_TAGXID) + #define XID_TAG(in) (!(in) || \ (((struct inode *)in)->i_sb && \ - (((struct inode *)in)->i_sb->s_flags & MS_TAGXID))) + XID_TAG_SB(((struct inode *)in)->i_sb))) + #ifdef CONFIG_XID_TAG_NFSD #define XID_TAG_NFSD 1 @@ -102,6 +105,13 @@ #endif +#ifdef CONFIG_INOXID_NONE +#define vx_current_fsxid(sb) (0) +#else +#define vx_current_fsxid(sb) \ + (XID_TAG_SB(sb) ? current->xid : 0) +#endif + #define INOXID_UID(tag, uid, gid) \ ((tag) ? ((uid) & MAX_UID) : (uid)) #define INOXID_GID(tag, uid, gid) \