LU-2456 lnet: DLC Feature dynamic net config

[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd_lib-darwin.c

diff --git a/lnet/klnds/socklnd/socklnd_lib-darwin.c b/lnet/klnds/socklnd/socklnd_lib-darwin.c
index 7a01d47..363183e 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_lib-darwin.c
+++ b/lnet/klnds/socklnd/socklnd_lib-darwin.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -99,7 +101,7 @@ SYSCTL_INT(_lnet_ksocknal,    OID_AUTO,         keepalive_intvl,
            CTLTYPE_INT | CTLFLAG_RW ,           &ksocknal_tunables.ksnd_keepalive_intvl, 
            0,                                   "keepalive_intvl");
 
-cfs_sysctl_table_t      ksocknal_top_ctl_table [] = {
+struct ctl_table      ksocknal_top_ctl_table [] = {
         &sysctl__lnet_ksocknal,
         &sysctl__lnet_ksocknal_timeout,
         &sysctl__lnet_ksocknal_credits,
@@ -123,7 +125,7 @@ int
 ksocknal_lib_tunables_init ()
 {
         ksocknal_tunables.ksnd_sysctl =
-                cfs_register_sysctl_table (ksocknal_top_ctl_table, 0);
+               register_sysctl_table (ksocknal_top_ctl_table);
 
         if (ksocknal_tunables.ksnd_sysctl == NULL)
                return -ENOMEM;
@@ -134,8 +136,8 @@ ksocknal_lib_tunables_init ()
 void
 ksocknal_lib_tunables_fini ()
 {
-        if (ksocknal_tunables.ksnd_sysctl != NULL)
-                cfs_unregister_sysctl_table (ksocknal_tunables.ksnd_sysctl);   
+       if (ksocknal_tunables.ksnd_sysctl != NULL)
+               unregister_sysctl_table (ksocknal_tunables.ksnd_sysctl);
 }
 #else
 int
@@ -262,7 +264,7 @@ ksocknal_lib_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
         int           i;
         
         for (nob = i = 0; i < niov; i++) {
-                scratchiov[i].iov_base = cfs_kmap(kiov[i].kiov_page) +
+               scratchiov[i].iov_base = kmap(kiov[i].kiov_page) +
                                          kiov[i].kiov_offset;
                 nob += scratchiov[i].iov_len = kiov[i].kiov_len;
         }
@@ -274,7 +276,7 @@ ksocknal_lib_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
          */
         rc = -sock_send(sock, &msg, MSG_DONTWAIT, &sndlen);
         for (i = 0; i < niov; i++)
-                cfs_kunmap(kiov[i].kiov_page);
+               kunmap(kiov[i].kiov_page);
         if (rc == 0)
                 rc = sndlen;
         return rc;
@@ -349,14 +351,14 @@ ksocknal_lib_recv_kiov (ksock_conn_t *conn)
         /* NB we can't trust socket ops to either consume our iovs
          * or leave them alone. */
         for (nob = i = 0; i < niov; i++) {
-                scratchiov[i].iov_base = cfs_kmap(kiov[i].kiov_page) + \
+               scratchiov[i].iov_base = kmap(kiov[i].kiov_page) + \
                                          kiov[i].kiov_offset;
                 nob += scratchiov[i].iov_len = kiov[i].kiov_len;
         }
         LASSERT (nob <= conn->ksnc_rx_nob_wanted);
         rc = -sock_receive(C2B_SOCK(conn->ksnc_sock), &msg, MSG_DONTWAIT, &rcvlen); 
         for (i = 0; i < niov; i++)
-                cfs_kunmap(kiov[i].kiov_page); 
+               kunmap(kiov[i].kiov_page);
         if (rc == 0)
                 rc = rcvlen;
         return (rc);
@@ -607,7 +609,7 @@ ksocknal_lib_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
         CFS_DECL_NET_DATA; 
         
         for (nob = i = 0; i < niov; i++) { 
-                scratchiov[i].iov_base = cfs_kmap(kiov[i].kiov_page) + 
+               scratchiov[i].iov_base = kmap(kiov[i].kiov_page) +
                                          kiov[i].kiov_offset; 
                 nob += scratchiov[i].iov_len = kiov[i].kiov_len; 
         }
@@ -618,7 +620,7 @@ ksocknal_lib_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
         CFS_NET_EX;
 
         for (i = 0; i < niov; i++) 
-                cfs_kunmap(kiov[i].kiov_page);
+               kunmap(kiov[i].kiov_page);
 
         if (rc != 0) {
                 if (suio.uio_resid != nob &&\
@@ -798,7 +800,7 @@ ksocknal_lib_recv_kiov (ksock_conn_t *conn)
         CFS_DECL_NET_DATA;
 
         for (nob = i = 0; i < niov; i++) { 
-                scratchiov[i].iov_base = cfs_kmap(kiov[i].kiov_page) + kiov[i].kiov_offset; 
+               scratchiov[i].iov_base = kmap(kiov[i].kiov_page) + kiov[i].kiov_offset;
                 nob += scratchiov[i].iov_len = kiov[i].kiov_len; 
         } 
         LASSERT (nob <= conn->ksnc_rx_nob_wanted);
@@ -810,7 +812,7 @@ ksocknal_lib_recv_kiov (ksock_conn_t *conn)
         CFS_NET_EX;
 
         for (i = 0; i < niov; i++) 
-                cfs_kunmap(kiov[i].kiov_page);
+               kunmap(kiov[i].kiov_page);
 
         if (rc){
                 if (ruio.uio_resid != nob && \