Attachment 161176 Details for Bug 238490 – RHEL-4 patch

[patch] RHEL-4 patch

lowcomms-close.patch (text/plain), 1.44 KB, created by Christine Caulfield on 2007-08-13 14:27:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2007-08-13 14:27:34 UTC

Size: 1.44 KB

patch

obsolete

>Index: lowcomms.c
>===================================================================
>RCS file: /cvs/cluster/cluster/dlm-kernel/src/Attic/lowcomms.c,v
>retrieving revision 1.22.2.16
>diff -u -p -r1.22.2.16 lowcomms.c
>--- lowcomms.c	6 Aug 2007 14:40:50 -0000	1.22.2.16
>+++ lowcomms.c	13 Aug 2007 09:12:10 -0000
>@@ -320,18 +320,9 @@ static void close_connection(struct conn
> 		__free_page(con->rx_page);
> 		con->rx_page = NULL;
> 	}
>-	/* 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 = connections[con->nodeid];
>-		parent->othercon = NULL;
>-		kmem_cache_free(con_cache, con);
>-	}
>-	else {
>-		/* Parent connections get reused */
>-		con->retries = 0;
>-		up_write(&con->sock_sem);
>-	}
>+
>+	con->retries = 0;
>+	up_write(&con->sock_sem);
> }
> 
> /* Data received from remote end */
>@@ -518,6 +509,8 @@ static int accept_from_sock(struct conne
> 			init_rwsem(&othercon->sock_sem);
> 			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);
>@@ -1215,6 +1208,8 @@ void lowcomms_stop(void)
> 		if (connections[i]) {
> 			close_connection(connections[i], TRUE);
> 			kmem_cache_free(con_cache, connections[i]);
>+			if (connections[i]->othercon)
>+				kmem_cache_free(con_cache, connections[i]->othercon);
> 		}
> 	}
>

Actions: View | Diff

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