X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fvserver%2Fnetwork.c;h=1a8272fdd374f65415796bd81f4b8dcf5965189c;hb=e0ff8aa1acd079b70e796571917ae0449b7c465b;hp=1ceb1fcb806c616c4730e520aa51d698fd98e458;hpb=bef9ea3086d47cf98cfd0ea389953a0af0b60114;p=linux-2.6.git

diff --git a/kernel/vserver/network.c b/kernel/vserver/network.c
index 1ceb1fcb8..1a8272fdd 100644
--- a/kernel/vserver/network.c
+++ b/kernel/vserver/network.c
@@ -3,13 +3,14 @@
  *
  *  Virtual Server: Network Support
  *
- *  Copyright (C) 2003-2005  Herbert Pötzl
+ *  Copyright (C) 2003-2006  Herbert Pötzl
  *
  *  V0.01  broken out from vcontext V0.05
  *  V0.02  cleaned up implementation
  *  V0.03  added equiv nx commands
  *  V0.04  switch to RCU based hash
  *  V0.05  and back to locking again
+ *  V0.06  have __create claim() the nxi
  *
  */
 
@@ -139,15 +140,16 @@ static inline void __hash_nx_info(struct nx_info *nxi)
 
 static inline void __unhash_nx_info(struct nx_info *nxi)
 {
-	vxd_assert_lock(&nx_info_hash_lock);
 	vxdprintk(VXD_CBIT(nid, 4),
 		"__unhash_nx_info: %p[#%d]", nxi, nxi->nx_id);
 
+	spin_lock(&nx_info_hash_lock);
 	/* context must be hashed */
 	BUG_ON(!nx_info_state(nxi, NXS_HASHED));
 
 	nxi->nx_state &= ~NXS_HASHED;
 	hlist_del(&nxi->nx_hlist);
+	spin_unlock(&nx_info_hash_lock);
 }
 
 
@@ -204,7 +206,7 @@ static inline nid_t __nx_dynamic_id(void)
 /*	__create_nx_info()
 
 	* create the requested context
-	* get() and hash it					*/
+	* get(), claim() and hash it				*/
 
 static struct nx_info * __create_nx_info(int id)
 {
@@ -249,6 +251,7 @@ static struct nx_info * __create_nx_info(int id)
 	/* new context */
 	vxdprintk(VXD_CBIT(nid, 0),
 		"create_nx_info(%d) = %p (new)", id, new);
+	claim_nx_info(new, NULL);
 	__hash_nx_info(get_nx_info(new));
 	nxi = new, new = NULL;
 
@@ -267,9 +270,7 @@ out_unlock:
 void unhash_nx_info(struct nx_info *nxi)
 {
 	__shutdown_nx_info(nxi);
-	spin_lock(&nx_info_hash_lock);
 	__unhash_nx_info(nxi);
-	spin_unlock(&nx_info_hash_lock);
 }
 
 #ifdef  CONFIG_VSERVER_LEGACYNET
@@ -386,6 +387,7 @@ int nx_migrate_task(struct task_struct *p, struct nx_info *nxi)
 
 	if (old_nxi)
 		release_nx_info(old_nxi, p);
+	ret = 0;
 out:
 	put_nx_info(old_nxi);
 	return ret;
@@ -488,8 +490,11 @@ int nx_addr_conflict(struct nx_info *nxi, uint32_t addr, struct sock *sk)
 
 void nx_set_persistent(struct nx_info *nxi)
 {
+	vxdprintk(VXD_CBIT(nid, 6),
+		"nx_set_persistent(%p[#%d])", nxi, nxi->nx_id);
+
 	get_nx_info(nxi);
-	claim_nx_info(nxi, current);
+	claim_nx_info(nxi, NULL);
 }
 
 void nx_clear_persistent(struct nx_info *nxi)
@@ -497,7 +502,7 @@ void nx_clear_persistent(struct nx_info *nxi)
 	vxdprintk(VXD_CBIT(nid, 6),
 		"nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id);
 
-	release_nx_info(nxi, current);
+	release_nx_info(nxi, NULL);
 	put_nx_info(nxi);
 }
 
@@ -585,26 +590,22 @@ int vc_net_create(uint32_t nid, void __user *data)
 	/* initial flags */
 	new_nxi->nx_flags = vc_data.flagword;
 
-	/* get a reference for persistent contexts */
-	if ((vc_data.flagword & NXF_PERSISTENT))
-		nx_set_persistent(new_nxi);
-
 	ret = -ENOEXEC;
 	if (vs_net_change(new_nxi, VSC_NETUP))
-		goto out_unhash;
+		goto out;
+
 	ret = nx_migrate_task(current, new_nxi);
-	if (!ret) {
-		/* return context id on success */
-		ret = new_nxi->nx_id;
+	if (ret)
 		goto out;
-	}
-out_unhash:
-	/* prepare for context disposal */
-	new_nxi->nx_state |= NXS_SHUTDOWN;
+
+	/* return context id on success */
+	ret = new_nxi->nx_id;
+
+	/* get a reference for persistent contexts */
 	if ((vc_data.flagword & NXF_PERSISTENT))
-		nx_clear_persistent(new_nxi);
-	__unhash_nx_info(new_nxi);
+		nx_set_persistent(new_nxi);
 out:
+	release_nx_info(new_nxi, NULL);
 	put_nx_info(new_nxi);
 	return ret;
 }