* Minor openibnal cleanups

diff --git a/lnet/klnds/openiblnd/openiblnd.c b/lnet/klnds/openiblnd/openiblnd.c
index 378fff9..4289210 100644 (file)
--- a/lnet/klnds/openiblnd/openiblnd.c
+++ b/lnet/klnds/openiblnd/openiblnd.c
@@ -750,7 +750,7 @@ kibnal_start_ip_listener (void)
         long           pid;
         int            rc;
 
-        CDEBUG(D_WARNING, "Starting listener\n");
+        CDEBUG(D_NET, "Starting listener\n");
 
         /* Called holding kib_nid_mutex: listener stopped */
         LASSERT (kibnal_data.kib_listener_sock == NULL);
@@ -768,7 +768,11 @@ kibnal_start_ip_listener (void)
         rc = kibnal_data.kib_listener_shutdown;
         LASSERT ((rc != 0) == (kibnal_data.kib_listener_sock == NULL));
 
-        CDEBUG(D_WARNING, "Listener %ld started OK\n", pid);
+        CDEBUG((rc == 0) ? D_WARNING : D_ERROR, 
+               "Listener %s: pid:%ld port:%d backlog:%d\n", 
+               (rc == 0) ? "started OK" : "startup failed",
+               pid, kibnal_tunables.kib_port, kibnal_tunables.kib_backlog);
+
         return rc;
 }
 
@@ -779,7 +783,7 @@ kibnal_stop_ip_listener(int clear_acceptq)
         kib_acceptsock_t *as;
         unsigned long     flags;
 
-        CDEBUG(D_WARNING, "Stopping listener\n");
+        CDEBUG(D_NET, "Stopping listener\n");
 
         /* Called holding kib_nid_mutex: listener running */
         LASSERT (kibnal_data.kib_listener_sock != NULL);
@@ -840,7 +844,6 @@ kibnal_listener_procint(ctl_table *table, int write, struct file *filp,
                         kibnal_stop_ip_listener(0);
 
                 rc = kibnal_start_ip_listener();
-
                 if (rc != 0) {
                         CERROR("Unable to restart listener with new tunable:"
                                " reverting to old value\n");

diff --git a/lnet/klnds/openiblnd/openiblnd_cb.c b/lnet/klnds/openiblnd/openiblnd_cb.c
index 7226ff9..34d465f 100644 (file)
--- a/lnet/klnds/openiblnd/openiblnd_cb.c
+++ b/lnet/klnds/openiblnd/openiblnd_cb.c
@@ -610,11 +610,6 @@ kibnal_map_kiov (kib_tx_t *tx, enum ib_memory_access access,
                 resid -= PAGE_SIZE;
         }
 
-#if 0
-        CWARN ("nphys %d, nob %d, page_offset %d\n", nphys, nob, page_offset);
-        for (rc = 0; rc < nphys; rc++)
-                CWARN ("   [%d] "LPX64" / %d\n", rc, phys[rc].address, phys[rc].size);
-#endif
         tx->tx_md.md_addr = IBNAL_RDMA_BASE;
 
 #if IBNAL_FMR
@@ -1627,8 +1622,6 @@ kibnal_connreq_done (kib_conn_t *conn, int active, int status)
         if (status == 0) {
                 /* Everything worked! */
 
-#warning "purge old conn incarnations"
-
                 peer->ibp_connecting--;
 
                 /* +1 ref for ibc_list; caller(== CM)'s ref remains until
@@ -2034,7 +2027,7 @@ kibnal_active_conn_callback (tTS_IB_CM_EVENT event,
         }
 
         case TS_IB_CM_ESTABLISHED:
-                CDEBUG(D_WARNING, "Connection %p -> "LPX64" Established\n",
+                CDEBUG(D_WARNING, "Connection %p -> "LPX64" ESTABLISHED\n",
                        conn, conn->ibc_peer->ibp_nid);
 
                 kibnal_connreq_done (conn, 1, 0);
@@ -2100,7 +2093,7 @@ kibnal_pathreq_callback (tTS_IB_CLIENT_QUERY_TID tid, int status,
         /* Flag I'm getting involved with the CM... */
         conn->ibc_state = IBNAL_CONN_CONNECTING;
 
-        CDEBUG(D_WARNING, "Connecting to, service id "LPX64", on "LPX64"\n",
+        CDEBUG(D_NET, "Connecting to, service id "LPX64", on "LPX64"\n",
                conn->ibc_connreq->cr_svcrsp.ibsr_svc_id, peer->ibp_nid);
 
         /* kibnal_connect_callback gets my conn ref */