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

[pcaulfield@sourceware.org <pcaulfield@sourceware.org>]

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;