i=liangzhen,i=maxim,b=16321:

[fs/lustre-release.git] / lnet / klnds / viblnd / viblnd_cb.c

diff --git a/lnet/klnds/viblnd/viblnd_cb.c b/lnet/klnds/viblnd/viblnd_cb.c
index d468673..0c7e323 100644 (file)
--- a/lnet/klnds/viblnd/viblnd_cb.c
+++ b/lnet/klnds/viblnd/viblnd_cb.c
@@ -160,7 +160,7 @@ kibnal_post_rx (kib_rx_t *rx, int credit, int rsrvd_credit)
         LASSERT (conn->ibc_state >= IBNAL_CONN_INIT);
         LASSERT (rx->rx_nob >= 0);              /* not posted */
 
-        CDEBUG(D_NET, "posting rx [%d %x "LPX64"]\n", 
+        CDEBUG(D_NET, "posting rx [%d %x "LPX64"]\n",
                rx->rx_wrq.scatgat_list->length,
                rx->rx_wrq.scatgat_list->l_key,
                KIBNAL_SG2ADDR(rx->rx_wrq.scatgat_list->v_address));
@@ -194,10 +194,10 @@ kibnal_post_rx (kib_rx_t *rx, int credit, int rsrvd_credit)
 
         spin_unlock(&conn->ibc_lock);
 
-        CERROR ("post rx -> %s failed %d\n", 
+        CERROR ("post rx -> %s failed %d\n",
                 libcfs_nid2str(conn->ibc_peer->ibp_nid), vvrc);
         rc = -EIO;
-        kibnal_close_conn(rx->rx_conn, rc);
+        kibnal_close_conn(conn, rc);
         /* No more posts for this rx; so lose its ref */
         kibnal_conn_decref(conn);
         return rc;
@@ -1739,7 +1739,7 @@ kibnal_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,
         case IBNAL_MSG_PUT_REQ:
                 if (mlen == 0) {
                         lnet_finalize(ni, lntmsg, 0);
-                        kibnal_send_completion(rx->rx_conn, IBNAL_MSG_PUT_NAK, 0,
+                        kibnal_send_completion(conn, IBNAL_MSG_PUT_NAK, 0,
                                                rxmsg->ibm_u.putreq.ibprm_cookie);
                         break;
                 }
@@ -1769,7 +1769,7 @@ kibnal_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,
                                libcfs_nid2str(conn->ibc_peer->ibp_nid), rc);
                         kibnal_tx_done(tx);
                         /* tell peer it's over */
-                        kibnal_send_completion(rx->rx_conn, IBNAL_MSG_PUT_NAK, rc,
+                        kibnal_send_completion(conn, IBNAL_MSG_PUT_NAK, rc,
                                                rxmsg->ibm_u.putreq.ibprm_cookie);
                         break;
                 }
@@ -1801,8 +1801,7 @@ kibnal_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,
                         kibnal_reply(ni, rx, lntmsg);
                 } else {
                         /* GET didn't match anything */
-                        kibnal_send_completion(rx->rx_conn, IBNAL_MSG_GET_DONE,
-                                               -ENODATA,
+                        kibnal_send_completion(conn, IBNAL_MSG_GET_DONE, -ENODATA,
                                                rxmsg->ibm_u.get.ibgm_cookie);
                 }
                 break;
@@ -2477,7 +2476,7 @@ kibnal_recv_connreq(cm_cep_handle_t *cep, cm_request_data_t *cmreq)
                         write_unlock_irqrestore(g_lock, flags);
 
                         CWARN("Conn race %s\n",
-                              libcfs_nid2str(peer2->ibp_nid));
+                              libcfs_nid2str(rxmsg.ibm_srcnid));
 
                         kibnal_peer_decref(peer);
                         reason = IBNAL_REJECT_CONN_RACE;
@@ -3055,7 +3054,7 @@ kibnal_arp_done (kib_conn_t *conn)
                                        path->pkey, &cv->cv_pkey_index);
                 if (vvrc != vv_return_ok) {
                         CWARN("pkey2pkey_index failed for %s @ %u.%u.%u.%u: %d\n",
-                              libcfs_nid2str(peer->ibp_nid), 
+                              libcfs_nid2str(peer->ibp_nid),
                               HIPQUAD(peer->ibp_ip), vvrc);
                         goto failed;
                 }
@@ -3085,7 +3084,7 @@ kibnal_arp_done (kib_conn_t *conn)
                                          &path->slid);
                 if (vvrc != vv_return_ok) {
                         CWARN("port_num2base_lid failed for %s @ %u.%u.%u.%u: %d\n",
-                              libcfs_nid2str(peer->ibp_ip), 
+                              libcfs_nid2str(peer->ibp_ip),
                               HIPQUAD(peer->ibp_ip), vvrc);
                         goto failed;
                 }