X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Facceptor.c;h=1209b183d6815df72378de41b5113b991ea28221;hp=c5ecb870ef9ed173806fa0779f4361fa68641da9;hb=3e42620b5b79170ec219e52d2a7e915559addba4;hpb=40e4d957e33268354a3fd938545bf717ed415372

diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c
index c5ecb87..1209b18 100644
--- a/lnet/lnet/acceptor.c
+++ b/lnet/lnet/acceptor.c
@@ -71,9 +71,9 @@ lnet_accept_magic(__u32 magic, __u32 constant)
 
 EXPORT_SYMBOL(lnet_acceptor_port);
 
-static char *accept = "secure";
+static char *accept_type = "secure";
 
-module_param(accept, charp, 0444);
+module_param_named(accept, accept_type, charp, 0444);
 MODULE_PARM_DESC(accept, "Accept connections (secure|all|none)");
 module_param(accept_port, int, 0444);
 MODULE_PARM_DESC(accept_port, "Acceptor's port (same on all nodes)");
@@ -82,18 +82,6 @@ MODULE_PARM_DESC(accept_backlog, "Acceptor's listen backlog");
 module_param(accept_timeout, int, 0644);
 MODULE_PARM_DESC(accept_timeout, "Acceptor's timeout (seconds)");
 
-static char *accept_type = NULL;
-
-static int
-lnet_acceptor_get_tunables(void)
-{
-	/* Userland acceptor uses 'accept_type' instead of 'accept', due to
-	 * conflict with 'accept(2)', but kernel acceptor still uses 'accept'
-	 * for compatibility. Hence the trick. */
-	accept_type = accept;
-	return 0;
-}
-
 int
 lnet_acceptor_timeout(void)
 {
@@ -156,15 +144,14 @@ lnet_connect_console_error (int rc, lnet_nid_t peer_nid,
 }
 EXPORT_SYMBOL(lnet_connect_console_error);
 
-int
-lnet_connect(struct socket **sockp, lnet_nid_t peer_nid,
-	    __u32 local_ip, __u32 peer_ip, int peer_port, struct net *ns)
+struct socket *
+lnet_connect(lnet_nid_t peer_nid, __u32 local_ip, __u32 peer_ip,
+	     int peer_port, struct net *ns)
 {
 	struct lnet_acceptor_connreq cr;
 	struct socket		*sock;
 	int			rc;
 	int			port;
-	int			fatal;
 
 	BUILD_BUG_ON(sizeof(cr) > 16); /* not too big to be on the stack */
 
@@ -173,13 +160,13 @@ lnet_connect(struct socket **sockp, lnet_nid_t peer_nid,
 	     --port) {
 		/* Iterate through reserved ports. */
 
-		rc = lnet_sock_connect(&sock, &fatal,
-					 local_ip, port,
+		sock = lnet_sock_connect(local_ip, port,
 					 peer_ip, peer_port, ns);
-		if (rc != 0) {
-			if (fatal)
-				goto failed;
-			continue;
+		if (IS_ERR(sock)) {
+			rc = PTR_ERR(sock);
+			if (rc == -EADDRINUSE || rc == -EADDRNOTAVAIL)
+				continue;
+			goto failed;
 		}
 
 		BUILD_BUG_ON(LNET_PROTO_ACCEPTOR_VERSION != 1);
@@ -201,8 +188,7 @@ lnet_connect(struct socket **sockp, lnet_nid_t peer_nid,
 		if (rc != 0)
 			goto failed_sock;
 
-		*sockp = sock;
-		return 0;
+		return sock;
 	}
 
 	rc = -EADDRINUSE;
@@ -212,7 +198,7 @@ failed_sock:
 	sock_release(sock);
 failed:
 	lnet_connect_console_error(rc, peer_nid, peer_ip, peer_port);
-	return rc;
+	return ERR_PTR(rc);
 }
 EXPORT_SYMBOL(lnet_connect);
 
@@ -369,12 +355,11 @@ lnet_acceptor(void *arg)
 
 	LASSERT(lnet_acceptor_state.pta_sock == NULL);
 
-	cfs_block_allsigs();
-
-	rc = lnet_sock_listen(&lnet_acceptor_state.pta_sock,
-			      0, accept_port, accept_backlog,
-			      lnet_acceptor_state.pta_ns);
-	if (rc != 0) {
+	lnet_acceptor_state.pta_sock =
+		lnet_sock_listen(0, accept_port, accept_backlog,
+				 lnet_acceptor_state.pta_ns);
+	if (IS_ERR(lnet_acceptor_state.pta_sock)) {
+		rc = PTR_ERR(lnet_acceptor_state.pta_sock);
 		if (rc == -EADDRINUSE)
 			LCONSOLE_ERROR_MSG(0x122, "Can't start acceptor on port"
 					   " %d: port already in use\n",
@@ -386,6 +371,7 @@ lnet_acceptor(void *arg)
 
 		lnet_acceptor_state.pta_sock = NULL;
 	} else {
+		rc = 0;
 		LCONSOLE(0, "Accept %s, port %d\n", accept_type, accept_port);
 		init_waitqueue_head(&lnet_acceptor_state.pta_waitq);
 		lnet_acceptor_state.pta_odata =
@@ -414,7 +400,8 @@ lnet_acceptor(void *arg)
 		if (!atomic_read(&lnet_acceptor_state.pta_ready))
 			continue;
 		atomic_set(&lnet_acceptor_state.pta_ready, 0);
-		rc = lnet_sock_accept(&newsock, lnet_acceptor_state.pta_sock);
+		rc = kernel_accept(lnet_acceptor_state.pta_sock, &newsock,
+				   SOCK_NONBLOCK);
 		if (rc != 0) {
 			if (rc != -EAGAIN) {
 				CWARN("Accept error %d: pausing...\n", rc);
@@ -501,10 +488,6 @@ lnet_acceptor_start(void)
 
 	LASSERT(lnet_acceptor_state.pta_sock == NULL);
 
-	rc = lnet_acceptor_get_tunables();
-	if (rc != 0)
-		return rc;
-
 	init_completion(&lnet_acceptor_state.pta_signal);
 	rc = accept2secure(accept_type, &secure);
 	if (rc <= 0)