Attachment 160411 Details for Bug 238490 – Patch to fix (I hope)

[patch] Patch to fix (I hope)

othercon.patch (text/plain), 2.17 KB, created by Christine Caulfield on 2007-08-01 13:53:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2007-08-01 13:53:44 UTC

Size: 2.17 KB

patch

obsolete

>diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
>index 631bc43..2dc8ed5 100644
>--- a/fs/dlm/lowcomms.c
>+++ b/fs/dlm/lowcomms.c
>@@ -328,15 +328,25 @@ 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);
>+
>+	/* If we are an 'othercon' then NULL the pointer to us
>+	   from the parent and tidy ourself up */
>+	if (test_bit(CF_IS_OTHERCON, &con->flags)) {
>+		struct connection *parent = __nodeid2con(con->nodeid, 0);
>+		printk("CC: freeing othercon for nodeid %d\n", con->nodeid);
>+		parent->othercon = NULL;
>+		kmem_cache_free(con_cache, con);
>+	}
>+	else {
>+		/* Parent connections get reused */
>+		con->retries = 0;
>+		mutex_unlock(&con->sock_mutex);
>+	}
> }
> 
> /* We only send shutdown messages to nodes that are not part of the cluster */
>@@ -634,7 +644,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 */
> 	}
>@@ -1125,7 +1135,8 @@ static int tcp_listen_for_all(void)
> 
> 	log_print("Using TCP for communications");
> 
>-	set_bit(CF_IS_OTHERCON, &con->flags);
>+	// CC why is this here??
>+	 //set_bit(CF_IS_OTHERCON, &con->flags);
> 
> 	sock = tcp_create_listen_sock(con, dlm_local_addr[0]);
> 	if (sock) {
>@@ -1410,7 +1421,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;
> 		}
>@@ -1425,9 +1436,8 @@ void dlm_lowcomms_stop(void)
> 	for (i = 0; i <= max_nodeid; i++) {
> 		con = __nodeid2con(i, 0);
> 		if (con) {
>+			printk("CC: closing parent con for nodeid %d\n", con->nodeid);
> 			close_connection(con, true);
>-			if (con->othercon)
>-				kmem_cache_free(con_cache, con->othercon);
> 			kmem_cache_free(con_cache, con);
> 		}
> 	}

Actions: View | Diff

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