---

yaml --- r: 155483 b: refs/heads/master c: a89d63a h: refs/heads/master i: 155481: 74544d3 155479: 5667ab3 v: v3
git-mirror · Jul 14, 2009 · f95b214 · f95b214
1 parent e4d10dc
commit f95b214
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c78a87d0a1fc885dfdbe21fd5e07787691dfb068
+refs/heads/master: a89d63a159b1ba5833be2bef00adf8ad8caac8be
diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c
@@ -902,7 +902,7 @@ static void tcp_connect_to_sock(struct connection *con)
 	int result = -EHOSTUNREACH;
 	struct sockaddr_storage saddr, src_addr;
 	int addr_len;
-	struct socket *sock;
+	struct socket *sock = NULL;
 
 	if (con->nodeid == 0) {
 		log_print("attempt to connect sock 0 foiled");
@@ -962,6 +962,8 @@ static void tcp_connect_to_sock(struct connection *con)
 	if (con->sock) {
 		sock_release(con->sock);
 		con->sock = NULL;
+	} else if (sock) {
+		sock_release(sock);
 	}
 	/*
 	 * Some errors are fatal and this list might need adjusting. For other