X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Facceptor.c;h=9e9b23651ec0747a2b3f22319ae85549410f2091;hb=60f6f21489287f0115626f40a5ad404804317f1b;hp=a28da788af5205c0365e3969835e6672b1c8bb8b;hpb=a07e9d350b3e500c7be877f6dcf54380b86a9cbe;p=fs%2Flustre-release.git

diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c
index a28da78..9e9b236 100644
--- a/lnet/lnet/acceptor.c
+++ b/lnet/lnet/acceptor.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -44,13 +44,9 @@ static int   accept_backlog = 127;
 static int   accept_timeout = 5;
 
 struct {
-        int                   pta_shutdown;
-        cfs_socket_t         *pta_sock;
-#ifdef __KERNEL__
-        cfs_completion_t      pta_signal;
-#else
-        cfs_mt_completion_t   pta_signal;
-#endif
+	int			pta_shutdown;
+	cfs_socket_t		*pta_sock;
+	struct completion	pta_signal;
 } lnet_acceptor_state;
 
 int
@@ -68,11 +64,6 @@ lnet_accept_magic(__u32 magic, __u32 constant)
 
 #ifdef __KERNEL__
 
-#define cfs_mt_init_completion(c)     cfs_init_completion(c)
-#define cfs_mt_wait_for_completion(c) cfs_wait_for_completion(c)
-#define cfs_mt_complete(c)            cfs_complete(c)
-#define cfs_mt_fini_completion(c)     cfs_fini_completion(c)
-
 EXPORT_SYMBOL(lnet_acceptor_port);
 
 static char *accept = "secure";
@@ -429,9 +420,9 @@ lnet_acceptor(void *arg)
                 LCONSOLE(0, "Accept %s, port %d\n", accept_type, accept_port);
         }
 
-        /* set init status and unblock parent */
-        lnet_acceptor_state.pta_shutdown = rc;
-        cfs_mt_complete(&lnet_acceptor_state.pta_signal);
+	/* set init status and unblock parent */
+	lnet_acceptor_state.pta_shutdown = rc;
+	complete(&lnet_acceptor_state.pta_signal);
 
         if (rc != 0)
                 return rc;
@@ -489,9 +480,9 @@ lnet_acceptor(void *arg)
 
         CDEBUG(D_NET, "Acceptor stopping\n");
 
-        /* unblock lnet_acceptor_stop() */
-        cfs_mt_complete(&lnet_acceptor_state.pta_signal);
-        return 0;
+	/* unblock lnet_acceptor_stop() */
+	complete(&lnet_acceptor_state.pta_signal);
+	return 0;
 }
 
 static inline int
@@ -531,59 +522,59 @@ lnet_acceptor_start(void)
                 return 0;
 #endif
 
-        cfs_mt_init_completion(&lnet_acceptor_state.pta_signal);
-        rc = accept2secure(accept_type, &secure);
-        if (rc <= 0) {
-                cfs_mt_fini_completion(&lnet_acceptor_state.pta_signal);
-                return rc;
-        }
+	init_completion(&lnet_acceptor_state.pta_signal);
+	rc = accept2secure(accept_type, &secure);
+	if (rc <= 0) {
+		fini_completion(&lnet_acceptor_state.pta_signal);
+		return rc;
+	}
 
-        if (lnet_count_acceptor_nis() == 0)  /* not required */
-                return 0;
+	if (lnet_count_acceptor_nis() == 0)  /* not required */
+		return 0;
 
-        rc2 = cfs_create_thread(lnet_acceptor, (void *)(ulong_ptr_t)secure, 0);
-        if (rc2 < 0) {
-                CERROR("Can't start acceptor thread: %d\n", rc);
-                cfs_mt_fini_completion(&lnet_acceptor_state.pta_signal);
+	rc2 = cfs_create_thread(lnet_acceptor, (void *)(ulong_ptr_t)secure, 0);
+	if (rc2 < 0) {
+		CERROR("Can't start acceptor thread: %d\n", rc);
+		fini_completion(&lnet_acceptor_state.pta_signal);
 
-                return -ESRCH;
-        }
+		return -ESRCH;
+	}
 
-        /* wait for acceptor to startup */
-        cfs_mt_wait_for_completion(&lnet_acceptor_state.pta_signal);
+	/* wait for acceptor to startup */
+	wait_for_completion(&lnet_acceptor_state.pta_signal);
 
-        if (!lnet_acceptor_state.pta_shutdown) {
-                /* started OK */
-                LASSERT (lnet_acceptor_state.pta_sock != NULL);
-                return 0;
-        }
+	if (!lnet_acceptor_state.pta_shutdown) {
+		/* started OK */
+		LASSERT(lnet_acceptor_state.pta_sock != NULL);
+		return 0;
+	}
 
-        LASSERT (lnet_acceptor_state.pta_sock == NULL);
-        cfs_mt_fini_completion(&lnet_acceptor_state.pta_signal);
+	LASSERT(lnet_acceptor_state.pta_sock == NULL);
+	fini_completion(&lnet_acceptor_state.pta_signal);
 
-        return -ENETDOWN;
+	return -ENETDOWN;
 }
 
 void
 lnet_acceptor_stop(void)
 {
-        if (lnet_acceptor_state.pta_sock == NULL) /* not running */
-                return;
+	if (lnet_acceptor_state.pta_sock == NULL) /* not running */
+		return;
 
-        lnet_acceptor_state.pta_shutdown = 1;
-        libcfs_sock_abort_accept(lnet_acceptor_state.pta_sock);
+	lnet_acceptor_state.pta_shutdown = 1;
+	libcfs_sock_abort_accept(lnet_acceptor_state.pta_sock);
 
-        /* block until acceptor signals exit */
-        cfs_mt_wait_for_completion(&lnet_acceptor_state.pta_signal);
+	/* block until acceptor signals exit */
+	wait_for_completion(&lnet_acceptor_state.pta_signal);
 
-        cfs_mt_fini_completion(&lnet_acceptor_state.pta_signal);
+	fini_completion(&lnet_acceptor_state.pta_signal);
 }
 
 #else /* single-threaded user-space */
 int
 lnet_acceptor_start(void)
 {
-        return 0;
+	return 0;
 }
 
 void