[Ocfs2-commits] zab commits r1757 - trunk/cluster

[svn-commits at oss.oracle.com]

Author: zab
Date: 2005-01-12 12:44:13 -0600 (Wed, 12 Jan 2005)
New Revision: 1757

Modified:
   trunk/cluster/tcp.c
Log:
o balance some locking in net_ so that we don't double-unlock on startup


Modified: trunk/cluster/tcp.c
===================================================================
--- trunk/cluster/tcp.c	2005-01-12 00:52:59 UTC (rev 1756)
+++ trunk/cluster/tcp.c	2005-01-12 18:44:13 UTC (rev 1757)
@@ -729,9 +729,9 @@
 		spin_lock(&priv->net.sock_lock); 
 		/* TODO: sock refcounting... i think we can get/put the sk */
 		sock = priv->net.sock;
+		spin_unlock(&priv->net.sock_lock); 
 		if (!sock)
 			return -EINVAL;
-		spin_unlock(&priv->net.sock_lock); 
 	}
 	
 	memset (&sin, 0, sizeof (sin));
@@ -874,6 +874,8 @@
 	}
 	priv = (nm_node_inode_private *)inode->u.generic_ip;
 	net = &priv->net;
+
+	/* this pattern is awfully awkward */
 	spin_lock(&net->sock_lock); 
 	if (!net->sock) {
 		spin_unlock(&net->sock_lock);
@@ -882,6 +884,7 @@
 			netprintk0("failed to create socket!");
 			return -EINVAL;
 		}
+		spin_lock(&net->sock_lock);
 	}
 	spin_unlock(&net->sock_lock); 
 	
@@ -1015,6 +1018,7 @@
 			netprintk0("failed to create socket!");
 			return -EINVAL;
 		}
+		spin_lock(&net->sock_lock); 
 	}
 	spin_unlock(&net->sock_lock);