From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 19:57:41 +0000 (+0000)
Subject: - sync vserver branch: will help future merges
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~139
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1c08bd7fd4e27378af95607cd27f77a61b246e07;p=linux-2.6.git

- sync vserver branch: will help future merges
---

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 1479c50ae..1b89830ba 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -153,16 +153,6 @@ void inet_sock_destruct(struct sock *sk)
 
 	if (inet->opt)
 		kfree(inet->opt);
-
-#warning MEF: figure out whether the following vserver net code is required by PlanetLab
-#if 0
-	vx_sock_dec(sk);
-	clr_vx_info(&sk->sk_vx_info);
-	sk->sk_xid = -1;
-	clr_nx_info(&sk->sk_nx_info);
-	sk->sk_nid = -1;
-#endif
-
 	dst_release(sk->sk_dst_cache);
 #ifdef INET_REFCNT_DEBUG
 	atomic_dec(&inet_sock_nr);
@@ -325,15 +315,6 @@ override:
 	sk->sk_protocol	   = protocol;
 	sk->sk_backlog_rcv = sk->sk_prot->backlog_rcv;
 
-#warning MEF: figure out whether the following vserver net code is required by PlanetLab
-#if 0
-	set_vx_info(&sk->sk_vx_info, current->vx_info);
-	sk->sk_xid = vx_current_xid();
-	vx_sock_inc(sk);
-	set_nx_info(&sk->sk_nx_info, current->nx_info);
-	sk->sk_nid = nx_current_nid();
-#endif
-
 	inet->uc_ttl	= -1;
 	inet->mc_loop	= 1;
 	inet->mc_ttl	= 1;
@@ -395,15 +376,6 @@ int inet_release(struct socket *sock)
 		    !(current->flags & PF_EXITING))
 			timeout = sk->sk_lingertime;
 		sock->sk = NULL;
-
-#warning MEF: figure out whether the following vserver net code is required by PlanetLab
-#if 0
-		vx_sock_dec(sk);
-		clr_vx_info(&sk->sk_vx_info);
-		//sk->sk_xid = -1;
-		clr_nx_info(&sk->sk_nx_info);
-		//sk->sk_nid = -1;
-#endif
 		sk->sk_prot->close(sk, timeout);
 	}
 	return 0;
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 4591a5be6..14ec5e44e 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -79,7 +79,6 @@
 #include <linux/seq_file.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter_ipv4.h>
-#include <linux/vs_base.h>
 
 struct hlist_head raw_v4_htable[RAWV4_HTABLE_SIZE];
 DEFINE_RWLOCK(raw_v4_lock);
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 682e6a9b3..00c1f4a8c 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -25,8 +25,6 @@
 #include <linux/module.h>
 #include <linux/sysctl.h>
 #include <linux/workqueue.h>
-#include <linux/vs_limit.h>
-#include <linux/vs_socket.h>
 #include <net/tcp.h>
 #include <net/inet_common.h>
 #include <net/xfrm.h>
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index d1c10f2ce..0706d1e08 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -49,9 +49,6 @@
 #include <linux/bitops.h>
 #include <linux/mm.h>
 #include <linux/types.h>
-#include <linux/vs_context.h>
-#include <linux/vs_network.h>
-#include <linux/vs_limit.h>
 #include <linux/audit.h>
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index f7c626a63..2cd6d2972 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -223,8 +223,6 @@ static void packet_sock_destruct(struct sock *sk)
 {
 	BUG_TRAP(!atomic_read(&sk->sk_rmem_alloc));
 	BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc));
-	BUG_ON(sk->sk_nx_info);
-	BUG_ON(sk->sk_vx_info);
 
 	if (!sock_flag(sk, SOCK_DEAD)) {
 		printk("Attempt to release alive packet socket: %p\n", sk);
@@ -833,12 +831,6 @@ static int packet_release(struct socket *sock)
 	}
 #endif
 
-#warning MEF: figure out whether the following vserver net code is required by PlanetLab
-#if 0
-	clr_vx_info(&sk->sk_vx_info);
-	clr_nx_info(&sk->sk_nx_info);
-#endif
-
 	/*
 	 *	Now the socket is dead. No more input will appear.
 	 */
@@ -1015,14 +1007,6 @@ static int packet_create(struct socket *sock, int protocol)
 	sk->sk_destruct = packet_sock_destruct;
 	atomic_inc(&packet_socks_nr);
 
-#warning MEF: figure out whether the following vserver net code is required by PlanetLab
-#if 0
-	set_vx_info(&sk->sk_vx_info, current->vx_info);
-	sk->sk_xid = vx_current_xid();
-	set_nx_info(&sk->sk_nx_info, current->nx_info);
-	sk->sk_nid = nx_current_nid();
-#endif
-
 	/*
 	 *	Attach a protocol block
 	 */
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 1d87b46d9..943137c69 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -401,9 +401,6 @@ static int unix_release_sock (struct sock *sk, int embrion)
 		mntput(mnt);
 	}
 
-	vx_sock_dec(sk);
-	clr_vx_info(&sk->sk_vx_info);
-	clr_nx_info(&sk->sk_nx_info);
 	sock_put(sk);
 
 	/* ---- Socket is dead now and most probably destroyed ---- */
@@ -564,11 +561,6 @@ static struct sock * unix_create1(struct socket *sock)
 
 	sock_init_data(sock,sk);
 
-	set_vx_info(&sk->sk_vx_info, current->vx_info);
-	sk->sk_xid = vx_current_xid();
-	vx_sock_inc(sk);
-	set_nx_info(&sk->sk_nx_info, current->nx_info);
-
 	sk->sk_write_space	= unix_write_space;
 	sk->sk_max_ack_backlog	= sysctl_unix_max_dgram_qlen;
 	sk->sk_destruct		= unix_sock_destructor;
@@ -792,7 +784,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 		 */
 		mode = S_IFSOCK |
 		       (SOCK_INODE(sock)->i_mode & ~current->fs->umask);
-		err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
+		err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0, NULL);
 		if (err)
 			goto out_mknod_dput;
 		up(&nd.dentry->d_inode->i_sem);