[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	pcaulfield at sourceware.org	2006-09-12 14:48:46

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Remove check for small packets as it seems to cause problems with
	some customer sites.
	Ref: bz#204146

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.22.2.12&r2=1.22.2.13

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2005/12/20 11:16:40	1.22.2.12
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2006/09/12 14:48:46	1.22.2.13
@@ -350,13 +350,6 @@
 		CBUF_INIT(&con->cb, PAGE_CACHE_SIZE);
 	}
 
-	/*
-	 * To avoid doing too many short reads, we will reschedule for
-	 * another time if there are less than 20 bytes left in the buffer.
-	 */
-	if (!CBUF_MAY_ADD(&con->cb, 20))
-		goto out_resched;
-
 	msg.msg_control = NULL;
 	msg.msg_controllen = 0;
 	msg.msg_iovlen = 1;

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4U4
Changes by:	teigland at sourceware.org	2006-09-26 16:39:07

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Copy the following change from the RHEL4 branch which removes
	CBUF_MAY_ADD(20) from dlm lowcomms:
	
	"Remove check for small packets as it seems to cause problems with
	some customer sites.
	Ref: bz#204146"

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL4U4&r1=1.22.2.12&r2=1.22.2.12.2.1

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2005/12/20 11:16:40	1.22.2.12
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2006/09/26 16:39:07	1.22.2.12.2.1
@@ -350,13 +350,6 @@
 		CBUF_INIT(&con->cb, PAGE_CACHE_SIZE);
 	}
 
-	/*
-	 * To avoid doing too many short reads, we will reschedule for
-	 * another time if there are less than 20 bytes left in the buffer.
-	 */
-	if (!CBUF_MAY_ADD(&con->cb, 20))
-		goto out_resched;
-
 	msg.msg_control = NULL;
 	msg.msg_controllen = 0;
 	msg.msg_iovlen = 1;

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	pcaulfield at sourceware.org	2007-06-27 10:39:40

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Fix bz#245828 "A TCP connection to DLM port blocks DLM operations"

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.22.2.13&r2=1.22.2.14

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2006/09/12 14:48:46	1.22.2.13
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/06/27 10:39:40	1.22.2.14
@@ -508,10 +508,16 @@
 			init_rwsem(&othercon->sock_sem);
 			set_bit(CF_IS_OTHERCON, &othercon->flags);
 			newcon->othercon = othercon;
+			othercon->sock = newsock;
+			newsock->sk->sk_user_data = othercon;
+			add_sock(newsock, othercon);
+		}
+		else {
+			printk("Extra connection from node %d attempted\n", nodeid);
+			result = -EAGAIN;
+			up_write(&newcon->sock_sem);
+			goto accept_err;
 		}
-		othercon->sock = newsock;
-		newsock->sk->sk_user_data = othercon;
-		add_sock(newsock, othercon);
 	}
 	else {
 		newsock->sk->sk_user_data = newcon;

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL45
Changes by:	pcaulfield at sourceware.org	2007-06-27 12:38:24

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Fix bz#245828 "A TCP connection to DLM port blocks DLM operations"

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL45&r1=1.22.2.13&r2=1.22.2.13.2.1

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2006/09/12 14:48:46	1.22.2.13
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/06/27 12:38:23	1.22.2.13.2.1
@@ -508,10 +508,16 @@
 			init_rwsem(&othercon->sock_sem);
 			set_bit(CF_IS_OTHERCON, &othercon->flags);
 			newcon->othercon = othercon;
+			othercon->sock = newsock;
+			newsock->sk->sk_user_data = othercon;
+			add_sock(newsock, othercon);
+		}
+		else {
+			printk("Extra connection from node %d attempted\n", nodeid);
+			result = -EAGAIN;
+			up_write(&newcon->sock_sem);
+			goto accept_err;
 		}
-		othercon->sock = newsock;
-		newsock->sk->sk_user_data = othercon;
-		add_sock(newsock, othercon);
 	}
 	else {
 		newsock->sk->sk_user_data = newcon;

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	pcaulfield at sourceware.org	2007-07-16 09:26:05

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Clean & deallocation 'othercon' structure when closing a connection.
	see bz#220538 (which is RHEL5 but still relevant)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.22.2.14&r2=1.22.2.15

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/06/27 10:39:40	1.22.2.14
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/07/16 09:26:05	1.22.2.15
@@ -315,6 +315,8 @@
 		   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);

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	pcaulfield at sourceware.org	2007-07-16 09:27:32

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Cler & free 'othercon' struct in close_connection.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.22.2.8.4.2.2.3&r2=1.22.2.8.4.2.2.4

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/02/07 15:25:04	1.22.2.8.4.2.2.3
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/07/16 09:27:32	1.22.2.8.4.2.2.4
@@ -316,6 +316,8 @@
 		   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);

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	pcaulfield at sourceware.org	2007-08-06 14:40:50

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Clean out 'othercon' structures when the connection is closed.
	bz#245828 comments 15->19 &
	bz#248957 comment 3

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.22.2.15&r2=1.22.2.16

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/07/16 09:26:05	1.22.2.15
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/08/06 14:40:50	1.22.2.16
@@ -315,15 +315,23 @@
 		   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;
-	up_write(&con->sock_sem);
+	/* 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);
+	}
 }
 
 /* Data received from remote end */
@@ -426,7 +434,7 @@
 
       out_close:
 	up_read(&con->sock_sem);
-	if (ret != -EAGAIN && !test_bit(CF_IS_OTHERCON, &con->flags)) {
+	if (ret != -EAGAIN) {
 		close_connection(con, FALSE);
 		/* Reconnect when there is something to send */
 	}
@@ -1206,8 +1214,6 @@
 	for (i = 0; i < conn_array_size; i++) {
 		if (connections[i]) {
 			close_connection(connections[i], TRUE);
-			if (connections[i]->othercon)
-				kmem_cache_free(con_cache, connections[i]->othercon);
 			kmem_cache_free(con_cache, connections[i]);
 		}
 	}

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL45
Changes by:	pcaulfield at sourceware.org	2007-08-06 14:46:48

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Clean out 'othercon' structures when the connection is closed.
	bz#245828 comments 15->19 &
	bz#248957 comment 3

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL45&r1=1.22.2.13.2.1&r2=1.22.2.13.2.2

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/06/27 12:38:23	1.22.2.13.2.1
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/08/06 14:46:48	1.22.2.13.2.2
@@ -320,8 +320,18 @@
 		__free_page(con->rx_page);
 		con->rx_page = NULL;
 	}
-	con->retries = 0;
-	up_write(&con->sock_sem);
+	/* 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);
+	}
 }
 
 /* Data received from remote end */
@@ -424,7 +434,7 @@
 
       out_close:
 	up_read(&con->sock_sem);
-	if (ret != -EAGAIN && !test_bit(CF_IS_OTHERCON, &con->flags)) {
+	if (ret != -EAGAIN) {
 		close_connection(con, FALSE);
 		/* Reconnect when there is something to send */
 	}
@@ -1204,8 +1214,6 @@
 	for (i = 0; i < conn_array_size; i++) {
 		if (connections[i]) {
 			close_connection(connections[i], TRUE);
-			if (connections[i]->othercon)
-				kmem_cache_free(con_cache, connections[i]->othercon);
 			kmem_cache_free(con_cache, connections[i]);
 		}
 	}

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	pcaulfield at sourceware.org	2007-08-13 20:07:11

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Fix for bz#238490 (at least)
	Keep othercons hanging around until we shut down, but clear out the
	sock member so we know which ones are active.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.22.2.16&r2=1.22.2.17

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/08/06 14:40:50	1.22.2.16
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/08/13 20:07:09	1.22.2.17
@@ -320,18 +320,9 @@
 		__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 @@
 			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 @@
 		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);
 		}
 	}
 

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL45
Changes by:	pcaulfield at sourceware.org	2007-08-13 20:09:20

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Fix for bz#238490 (at least)
	Keep othercons hanging around until we shut down, but clear out the
	sock member so we know which ones are active.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL45&r1=1.22.2.13.2.2&r2=1.22.2.13.2.3

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/08/06 14:46:48	1.22.2.13.2.2
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/08/13 20:09:20	1.22.2.13.2.3
@@ -320,18 +320,9 @@
 		__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 @@
 			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 @@
 		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);
 		}
 	}
 

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2007-10-30 17:41:13

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Fix #338511 - dlm trying to connect from wrong IP

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.22.2.17&r2=1.22.2.18

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/08/13 20:07:09	1.22.2.17
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/10/30 17:41:13	1.22.2.18
@@ -555,6 +555,7 @@
 {
 	int result = -EHOSTUNREACH;
 	struct sockaddr_in6 saddr;
+	struct sockaddr_in6 my_addr;
 	int addr_len;
 	struct socket *sock;
 
@@ -589,6 +590,13 @@
 
 	add_sock(sock, con);
 
+	/* Bind to local address before send */
+	memcpy(&my_addr, &local_addr, sizeof(my_addr));
+	result = sock->ops->bind(sock, &my_addr, (int)(sizeof(my_addr)));
+	if (result < 0) {
+		printk("dlm: could not bind to local address for connect: %d\n", result);
+	}
+
 	log_debug2("connecting to %d", con->nodeid);
 	result =
 	    sock->ops->connect(sock, (struct sockaddr *) &saddr, addr_len,

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL46
Changes by:	lhh at sourceware.org	2007-10-30 17:42:04

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Fix #338511 - dlm trying to connect from wrong IP

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL46&r1=1.22.2.17&r2=1.22.2.17.2.1

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/08/13 20:07:09	1.22.2.17
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/10/30 17:42:04	1.22.2.17.2.1
@@ -555,6 +555,7 @@
 {
 	int result = -EHOSTUNREACH;
 	struct sockaddr_in6 saddr;
+	struct sockaddr_in6 my_addr;
 	int addr_len;
 	struct socket *sock;
 
@@ -589,6 +590,13 @@
 
 	add_sock(sock, con);
 
+	/* Bind to local address before send */
+	memcpy(&my_addr, &local_addr, sizeof(my_addr));
+	result = sock->ops->bind(sock, &my_addr, (int)(sizeof(my_addr)));
+	if (result < 0) {
+		printk("dlm: could not bind to local address for connect: %d\n", result);
+	}
+
 	log_debug2("connecting to %d", con->nodeid);
 	result =
 	    sock->ops->connect(sock, (struct sockaddr *) &saddr, addr_len,

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL46
Changes by:	lhh at sourceware.org	2007-11-07 15:22:23

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Revert broken patch & apply correct patch from 338511

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL46&r1=1.22.2.17.2.1&r2=1.22.2.17.2.2

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/10/30 17:42:04	1.22.2.17.2.1
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/11/07 15:22:23	1.22.2.17.2.2
@@ -586,17 +586,20 @@
 	sock->sk->sk_user_data = con;
 	con->rx_action = receive_from_sock;
 
-	make_sockaddr(&saddr, dlm_config.tcp_port, &addr_len);
-
-	add_sock(sock, con);
-
 	/* Bind to local address before send */
 	memcpy(&my_addr, &local_addr, sizeof(my_addr));
-	result = sock->ops->bind(sock, &my_addr, (int)(sizeof(my_addr)));
+	make_sockaddr(&my_addr, 0, &addr_len);
+	result = sock->ops->bind(sock, (struct sockaddr *) &my_addr,
+				 (int) sizeof(my_addr));
 	if (result < 0) {
-		printk("dlm: could not bind to local address for connect: %d\n", result);
+		printk("dlm: could not bind for connect: %d\n", result);
 	}
 
+	/* Set up for connect */
+	make_sockaddr(&saddr, dlm_config.tcp_port, &addr_len);
+
+	add_sock(sock, con);
+
 	log_debug2("connecting to %d", con->nodeid);
 	result =
 	    sock->ops->connect(sock, (struct sockaddr *) &saddr, addr_len,

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2007-11-07 15:24:20

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Revert broken patch & apply correct patch from 338511

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.22.2.18&r2=1.22.2.19

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/10/30 17:41:13	1.22.2.18
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/11/07 15:24:19	1.22.2.19
@@ -586,17 +586,20 @@
 	sock->sk->sk_user_data = con;
 	con->rx_action = receive_from_sock;
 
-	make_sockaddr(&saddr, dlm_config.tcp_port, &addr_len);
-
-	add_sock(sock, con);
-
 	/* Bind to local address before send */
 	memcpy(&my_addr, &local_addr, sizeof(my_addr));
-	result = sock->ops->bind(sock, &my_addr, (int)(sizeof(my_addr)));
+	make_sockaddr(&my_addr, 0, &addr_len);
+	result = sock->ops->bind(sock, (struct sockaddr *) &my_addr,
+				 (int) sizeof(my_addr));
 	if (result < 0) {
-		printk("dlm: could not bind to local address for connect: %d\n", result);
+		printk("dlm: could not bind for connect: %d\n", result);
 	}
 
+	/* Set up for connect */
+	make_sockaddr(&saddr, dlm_config.tcp_port, &addr_len);
+
+	add_sock(sock, con);
+
 	log_debug2("connecting to %d", con->nodeid);
 	result =
 	    sock->ops->connect(sock, (struct sockaddr *) &saddr, addr_len,

[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL45
Changes by:	lhh at sourceware.org	2007-11-07 18:55:47

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Apply patch from 338511 to fix 4.5 bug #362641

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL45&r1=1.22.2.13.2.3&r2=1.22.2.13.2.4

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/08/13 20:09:20	1.22.2.13.2.3
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/11/07 18:55:47	1.22.2.13.2.4
@@ -555,6 +555,7 @@
 {
 	int result = -EHOSTUNREACH;
 	struct sockaddr_in6 saddr;
+	struct sockaddr_in6 my_addr;
 	int addr_len;
 	struct socket *sock;
 
@@ -585,6 +586,16 @@
 	sock->sk->sk_user_data = con;
 	con->rx_action = receive_from_sock;
 
+	/* Bind to local address before send */
+	memcpy(&my_addr, &local_addr, sizeof(my_addr));
+	make_sockaddr(&my_addr, 0, &addr_len);
+	result = sock->ops->bind(sock, (struct sockaddr *) &my_addr,
+				 (int) sizeof(my_addr));
+	if (result < 0) {
+		printk("dlm: could not bind for connect: %d\n", result);
+	}
+
+	/* Set up for connect */
 	make_sockaddr(&saddr, dlm_config.tcp_port, &addr_len);
 
 	add_sock(sock, con);