From f95b214c04c23665ccd120e5cd51dd4605902fc9 Mon Sep 17 00:00:00 2001 From: Casey Dahlin Date: Tue, 14 Jul 2009 12:17:51 -0500 Subject: [PATCH] --- yaml --- r: 155483 b: refs/heads/master c: a89d63a159b1ba5833be2bef00adf8ad8caac8be h: refs/heads/master i: 155481: 74544d3cfe46570344869413eb2875c8021eef73 155479: 5667ab3d9fc49f2dfaa4381ab684a9340a769257 v: v3 --- [refs] | 2 +- trunk/fs/dlm/lowcomms.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7afeef33ad22..02c11cba869e 100644 --- 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 index cdb580a9c7a2..618a60f03886 100644 --- 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