b=2774

[fs/lustre-release.git] / lustre / portals / knals / socknal / socknal_cb.c

diff --git a/lustre/portals/knals/socknal/socknal_cb.c b/lustre/portals/knals/socknal/socknal_cb.c
index 7c84ec8..0678d41 100644 (file)
--- a/lustre/portals/knals/socknal/socknal_cb.c
+++ b/lustre/portals/knals/socknal/socknal_cb.c
@@ -1182,6 +1182,7 @@ ksocknal_fmb_callback (void *arg, int error)
         ksock_sched_t     *sched;
         unsigned long      flags;
         char               ipbuf[PTL_NALFMT_SIZE];
+        char               ipbuf2[PTL_NALFMT_SIZE];
 
         if (error != 0)
                 CERROR("Failed to route packet from "
@@ -1189,7 +1190,7 @@ ksocknal_fmb_callback (void *arg, int error)
                        NTOH__u64(hdr->src_nid),
                        portals_nid2str(SOCKNAL, NTOH__u64(hdr->src_nid), ipbuf),
                        NTOH__u64(hdr->dest_nid),
-                       portals_nid2str(SOCKNAL, NTOH__u64(hdr->dest_nid), ipbuf),
+                       portals_nid2str(SOCKNAL, NTOH__u64(hdr->dest_nid), ipbuf2),
                        error);
         else
                 CDEBUG (D_NET, "routed packet from "LPX64" to "LPX64": OK\n",
@@ -1378,6 +1379,7 @@ ksocknal_fwd_parse (ksock_conn_t *conn)
         ptl_nid_t     src_nid = NTOH__u64 (conn->ksnc_hdr.src_nid);
         int           body_len = NTOH__u32 (conn->ksnc_hdr.payload_length);
         char str[PTL_NALFMT_SIZE];
+        char str2[PTL_NALFMT_SIZE];
 
         CDEBUG (D_NET, "%p "LPX64"->"LPX64" %d parsing header\n", conn,
                 src_nid, dest_nid, conn->ksnc_rx_nob_left);
@@ -1389,7 +1391,7 @@ ksocknal_fwd_parse (ksock_conn_t *conn)
                 CERROR("dropping packet from "LPX64" (%s) for "LPX64" (%s): "
                        "packet size %d illegal\n",
                        src_nid, portals_nid2str(TCPNAL, src_nid, str),
-                       dest_nid, portals_nid2str(TCPNAL, dest_nid, str),
+                       dest_nid, portals_nid2str(TCPNAL, dest_nid, str2),
                        body_len);
 
                 ksocknal_new_packet (conn, 0);  /* on to new packet */
@@ -1400,7 +1402,7 @@ ksocknal_fwd_parse (ksock_conn_t *conn)
                 CERROR("dropping packet from "LPX64" (%s) for "LPX64
                        " (%s): not forwarding\n",
                        src_nid, portals_nid2str(TCPNAL, src_nid, str),
-                       dest_nid, portals_nid2str(TCPNAL, dest_nid, str));
+                       dest_nid, portals_nid2str(TCPNAL, dest_nid, str2));
                 /* on to new packet (skip this one's body) */
                 ksocknal_new_packet (conn, body_len);
                 return;
@@ -1410,7 +1412,7 @@ ksocknal_fwd_parse (ksock_conn_t *conn)
                 CERROR ("dropping packet from "LPX64" (%s) for "LPX64
                         "(%s): packet size %d too big\n",
                         src_nid, portals_nid2str(TCPNAL, src_nid, str),
-                        dest_nid, portals_nid2str(TCPNAL, dest_nid, str),
+                        dest_nid, portals_nid2str(TCPNAL, dest_nid, str2),
                         body_len);
                 /* on to new packet (skip this one's body) */
                 ksocknal_new_packet (conn, body_len);
@@ -1423,7 +1425,7 @@ ksocknal_fwd_parse (ksock_conn_t *conn)
                 CERROR ("dropping packet from "LPX64" (%s) for "LPX64
                         "(%s): target is a peer\n",
                         src_nid, portals_nid2str(TCPNAL, src_nid, str),
-                        dest_nid, portals_nid2str(TCPNAL, dest_nid, str));
+                        dest_nid, portals_nid2str(TCPNAL, dest_nid, str2));
                 ksocknal_put_peer (peer);  /* drop ref from get above */
 
                 /* on to next packet (skip this one's body) */
@@ -2029,6 +2031,7 @@ ksocknal_hello (struct socket *sock, ptl_nid_t *nid, int *type,
         ptl_hdr_t           hdr;
         ptl_magicversion_t *hmv = (ptl_magicversion_t *)&hdr.dest_nid;
         char                ipbuf[PTL_NALFMT_SIZE];
+        char                ipbuf2[PTL_NALFMT_SIZE];
 
         LASSERT (sizeof (*hmv) == sizeof (hdr.dest_nid));
 
@@ -2115,7 +2118,7 @@ ksocknal_hello (struct socket *sock, ptl_nid_t *nid, int *type,
                         portals_nid2str(SOCKNAL,
                                         __le64_to_cpu(hdr.src_nid),
                                         ipbuf),
-                        *nid, portals_nid2str(SOCKNAL, *nid, ipbuf));
+                        *nid, portals_nid2str(SOCKNAL, *nid, ipbuf2));
                 return (-EPROTO);
         }
 
@@ -2425,6 +2428,7 @@ ksocknal_autoconnect (ksock_route_t *route)
 
         while (!list_empty (&zombies)) {
                 char ipbuf[PTL_NALFMT_SIZE];
+                char ipbuf2[PTL_NALFMT_SIZE];
                 tx = list_entry (zombies.next, ksock_tx_t, tx_list);
 
                 CERROR ("Deleting packet type %d len %d ("LPX64" %s->"LPX64" %s)\n",
@@ -2437,7 +2441,7 @@ ksocknal_autoconnect (ksock_route_t *route)
                         NTOH__u64 (tx->tx_hdr->dest_nid),
                         portals_nid2str(SOCKNAL,
                                         NTOH__u64(tx->tx_hdr->src_nid),
-                                        ipbuf));
+                                        ipbuf2));
 
                 list_del (&tx->tx_list);
                 /* complete now */