Attachment 161164 Details for Bug 238490 – New Patch

[patch] New Patch

lowcomms-close-patch.stevew (text/plain), 1.90 KB, created by Christine Caulfield on 2007-08-13 10:31:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2007-08-13 10:31:01 UTC

Size: 1.90 KB

patch

obsolete

>diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
>index 631bc43..86c22bb 100644
>--- a/fs/dlm/lowcomms.c
>+++ b/fs/dlm/lowcomms.c
>@@ -328,13 +328,12 @@ static void close_connection(struct connection *con, bool and_other)
> 	if (con->othercon && and_other) {
> 		/* Will only re-enter once. */
> 		close_connection(con->othercon, false);
>-		kmem_cache_free(con_cache, con->othercon);
>-		con->othercon = NULL;
> 	}
> 	if (con->rx_page) {
> 		__free_page(con->rx_page);
> 		con->rx_page = NULL;
> 	}
>+
> 	con->retries = 0;
> 	mutex_unlock(&con->sock_mutex);
> }
>@@ -634,7 +633,7 @@ out_resched:
> 
> out_close:
> 	mutex_unlock(&con->sock_mutex);
>-	if (ret != -EAGAIN && !test_bit(CF_IS_OTHERCON, &con->flags)) {
>+	if (ret != -EAGAIN) {
> 		close_connection(con, false);
> 		/* Reconnect when there is something to send */
> 	}
>@@ -723,6 +722,8 @@ static int tcp_accept_from_sock(struct connection *con)
> 			INIT_WORK(&othercon->rwork, process_recv_sockets);
> 			set_bit(CF_IS_OTHERCON, &othercon->flags);
> 			newcon->othercon = othercon;
>+		}
>+		if (!othercon->sock) {
> 			othercon->sock = newsock;
> 			newsock->sk->sk_user_data = othercon;
> 			add_sock(newsock, othercon);
>@@ -1125,8 +1126,6 @@ static int tcp_listen_for_all(void)
> 
> 	log_print("Using TCP for communications");
> 
>-	set_bit(CF_IS_OTHERCON, &con->flags);
>-
> 	sock = tcp_create_listen_sock(con, dlm_local_addr[0]);
> 	if (sock) {
> 		add_sock(sock, con);
>@@ -1410,7 +1409,7 @@ void dlm_lowcomms_stop(void)
> 	for (i = 0; i <= max_nodeid; i++) {
> 		con = __nodeid2con(i, 0);
> 		if (con) {
>-			con->flags |= 0xFF;
>+			con->flags |= 0x0F;
> 			if (con->sock)
> 				con->sock->sk->sk_user_data = NULL;
> 		}
>@@ -1426,9 +1425,9 @@ void dlm_lowcomms_stop(void)
> 		con = __nodeid2con(i, 0);
> 		if (con) {
> 			close_connection(con, true);
>+			kmem_cache_free(con_cache, con);
> 			if (con->othercon)
> 				kmem_cache_free(con_cache, con->othercon);
>-			kmem_cache_free(con_cache, con);
> 		}
> 	}
> 	max_nodeid = 0;

Actions: View | Diff

Attachments on bug 238490: 160316 | 160317 | 160411 | 161164 | 161165 | 161176