X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fklnds%2Fsocklnd%2Fsocklnd_cb.c;h=8139047191e66c4b9ed4e208a89d9dff26e6ecd6;hb=refs%2Fchanges%2F96%2F33096%2F4;hp=01f9629998cb44d41ad4ddf58e862f8bebca4f4b;hpb=b04c35874dca17a191ddbac9b52b005066a10dda;p=fs%2Flustre-release.git

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 01f9629..8139047 100644
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -409,9 +409,6 @@ ksocknal_tx_done(struct lnet_ni *ni, struct ksock_tx *tx, int rc)
 
 	ksocknal_free_tx(tx);
 	if (lnetmsg != NULL) { /* KSOCK_MSG_NOOP go without lnetmsg */
-		if (rc)
-			CERROR("tx failure rc = %d, hstatus = %d\n", rc,
-			       hstatus);
 		lnetmsg->msg_health_status = hstatus;
 		lnet_finalize(lnetmsg, rc);
 	}
@@ -1345,7 +1342,10 @@ ksocknal_process_receive(struct ksock_conn *conn)
                                         le64_to_cpu(lhdr->src_nid) != id->nid);
                 }
 
-		lnet_finalize(conn->ksnc_cookie, rc);
+		if (rc && conn->ksnc_lnet_msg)
+			conn->ksnc_lnet_msg->msg_health_status =
+				LNET_MSG_STATUS_REMOTE_ERROR;
+		lnet_finalize(conn->ksnc_lnet_msg, rc);
 
                 if (rc != 0) {
                         ksocknal_new_packet(conn, 0);
@@ -1381,9 +1381,9 @@ ksocknal_recv(struct lnet_ni *ni, void *private, struct lnet_msg *msg,
         LASSERT (mlen <= rlen);
         LASSERT (niov <= LNET_MAX_IOV);
 
-        conn->ksnc_cookie = msg;
-        conn->ksnc_rx_nob_wanted = mlen;
-        conn->ksnc_rx_nob_left   = rlen;
+	conn->ksnc_lnet_msg = msg;
+	conn->ksnc_rx_nob_wanted = mlen;
+	conn->ksnc_rx_nob_left   = rlen;
 
         if (mlen == 0 || iov != NULL) {
                 conn->ksnc_rx_nkiov = 0;