LU-3963 libcfs: remove cfs_hash_long

[fs/lustre-release.git] / lnet / lnet / api-ni.c

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index bfc84d6..7ba7a3d 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -100,7 +100,7 @@ void
 lnet_init_locks(void)
 {
        spin_lock_init(&the_lnet.ln_eq_wait_lock);
-       cfs_waitq_init(&the_lnet.ln_eq_waitq);
+       init_waitqueue_head(&the_lnet.ln_eq_waitq);
        mutex_init(&the_lnet.ln_lnd_mutex);
        mutex_init(&the_lnet.ln_api_mutex);
 }
@@ -429,7 +429,7 @@ lnet_counters_get(lnet_counters_t *counters)
                counters->send_count   += ctr->send_count;
                counters->recv_count   += ctr->recv_count;
                counters->route_count  += ctr->route_count;
-               counters->drop_length  += ctr->drop_length;
+               counters->drop_count   += ctr->drop_count;
                counters->send_length  += ctr->send_length;
                counters->recv_length  += ctr->recv_length;
                counters->route_length += ctr->route_length;
@@ -731,11 +731,11 @@ lnet_prepare(lnet_pid_t requested_pid)
         the_lnet.ln_pid = requested_pid;
 #else
         if (the_lnet.ln_server_mode_flag) {/* server case (uOSS) */
-                LASSERT ((requested_pid & LNET_PID_USERFLAG) == 0);
+               LASSERT ((requested_pid & LNET_PID_USERFLAG) == 0);
 
-                if (cfs_curproc_uid())/* Only root can run user-space server */
-                        return -EPERM;
-                the_lnet.ln_pid = requested_pid;
+               if (current_uid() != 0) /* Only root can run user-space server */
+                       return -EPERM;
+               the_lnet.ln_pid = requested_pid;
 
         } else {/* client case (liblustre) */
 
@@ -892,7 +892,7 @@ lnet_nid_cpt_hash(lnet_nid_t nid, unsigned int number)
        if (number == 1)
                return 0;
 
-       val = cfs_hash_long(key, LNET_CPT_BITS);
+       val = hash_long(key, LNET_CPT_BITS);
        /* NB: LNET_CP_NUMBER doesn't have to be PO2 */
        if (val < number)
                return val;
@@ -1126,13 +1126,13 @@ lnet_shutdown_lndnis (void)
                ni->ni_lnd->lnd_refcount--;
                lnet_net_unlock(LNET_LOCK_EX);
 
-                islo = ni->ni_lnd->lnd_type == LOLND;
+               islo = ni->ni_lnd->lnd_type == LOLND;
 
-                LASSERT (!cfs_in_interrupt ());
-                (ni->ni_lnd->lnd_shutdown)(ni);
+               LASSERT (!in_interrupt ());
+               (ni->ni_lnd->lnd_shutdown)(ni);
 
-                /* can't deref lnd anymore now; it might have unregistered
-                 * itself...  */
+               /* can't deref lnd anymore now; it might have unregistered
+                * itself...  */
 
                 if (!islo)
                         CDEBUG(D_LNI, "Removed LNI %s\n",
@@ -1194,10 +1194,10 @@ lnet_startup_lndnis (void)
 
 #ifdef __KERNEL__
                 if (lnd == NULL) {
-                        LNET_MUTEX_UNLOCK(&the_lnet.ln_lnd_mutex);
-                        rc = cfs_request_module("%s",
-                                                libcfs_lnd2modname(lnd_type));
-                        LNET_MUTEX_LOCK(&the_lnet.ln_lnd_mutex);
+                       LNET_MUTEX_UNLOCK(&the_lnet.ln_lnd_mutex);
+                       rc = request_module("%s",
+                                               libcfs_lnd2modname(lnd_type));
+                       LNET_MUTEX_LOCK(&the_lnet.ln_lnd_mutex);
 
                         lnd = lnet_find_lnd_by_type(lnd_type);
                         if (lnd == NULL) {
@@ -1888,14 +1888,14 @@ lnet_ping_target_init(void)
 void
 lnet_ping_target_fini(void)
 {
-        lnet_event_t    event;
-        int             rc;
-        int             which;
-        int             timeout_ms = 1000;
-        cfs_sigset_t    blocked = cfs_block_allsigs();
+       lnet_event_t    event;
+       int             rc;
+       int             which;
+       int             timeout_ms = 1000;
+       sigset_t    blocked = cfs_block_allsigs();
 
-        LNetMDUnlink(the_lnet.ln_ping_target_md);
-        /* NB md could be busy; this just starts the unlink */
+       LNetMDUnlink(the_lnet.ln_ping_target_md);
+       /* NB md could be busy; this just starts the unlink */
 
         for (;;) {
                 rc = LNetEQPoll(&the_lnet.ln_ping_target_eq, 1,
@@ -1925,28 +1925,28 @@ lnet_ping_target_fini(void)
 int
 lnet_ping (lnet_process_id_t id, int timeout_ms, lnet_process_id_t *ids, int n_ids)
 {
-        lnet_handle_eq_t     eqh;
-        lnet_handle_md_t     mdh;
-        lnet_event_t         event;
-        lnet_md_t            md = {0};
-        int                  which;
-        int                  unlinked = 0;
-        int                  replied = 0;
-        const int            a_long_time = 60000; /* mS */
-        int                  infosz = offsetof(lnet_ping_info_t, pi_ni[n_ids]);
-        lnet_ping_info_t    *info;
-        lnet_process_id_t    tmpid;
-        int                  i;
-        int                  nob;
-        int                  rc;
-        int                  rc2;
-        cfs_sigset_t         blocked;
-
-        if (n_ids <= 0 ||
-            id.nid == LNET_NID_ANY ||
-            timeout_ms > 500000 ||              /* arbitrary limit! */
-            n_ids > 20)                         /* arbitrary limit! */
-                return -EINVAL;
+       lnet_handle_eq_t     eqh;
+       lnet_handle_md_t     mdh;
+       lnet_event_t         event;
+       lnet_md_t            md = {0};
+       int                  which;
+       int                  unlinked = 0;
+       int                  replied = 0;
+       const int            a_long_time = 60000; /* mS */
+       int                  infosz = offsetof(lnet_ping_info_t, pi_ni[n_ids]);
+       lnet_ping_info_t    *info;
+       lnet_process_id_t    tmpid;
+       int                  i;
+       int                  nob;
+       int                  rc;
+       int                  rc2;
+       sigset_t         blocked;
+
+       if (n_ids <= 0 ||
+           id.nid == LNET_NID_ANY ||
+           timeout_ms > 500000 ||              /* arbitrary limit! */
+           n_ids > 20)                         /* arbitrary limit! */
+               return -EINVAL;
 
         if (id.pid == LNET_PID_ANY)
                 id.pid = LUSTRE_SRV_LNET_PID;