LU-10391 lnet: use %pISc for formatting IP addresses

[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd_proto.c

diff --git a/lnet/klnds/socklnd/socklnd_proto.c b/lnet/klnds/socklnd/socklnd_proto.c
index 40a1ffb..b90c3d2 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_proto.c
+++ b/lnet/klnds/socklnd/socklnd_proto.c
@@ -543,7 +543,7 @@ ksocknal_send_hello_v1(struct ksock_conn *conn, struct ksock_hello_msg *hello)
 
        rc = lnet_sock_write(sock, hdr, sizeof(*hdr), lnet_acceptor_timeout());
        if (rc != 0) {
-               CNETERR("Error %d sending HELLO hdr to %pISp\n",
+               CNETERR("Error %d sending HELLO hdr to %pIScp\n",
                        rc, &conn->ksnc_peeraddr);
                goto out;
        }
@@ -558,7 +558,7 @@ ksocknal_send_hello_v1(struct ksock_conn *conn, struct ksock_hello_msg *hello)
                             hello->kshm_nips * sizeof(__u32),
                             lnet_acceptor_timeout());
        if (rc != 0) {
-               CNETERR("Error %d sending HELLO payload (%d) to %pISp\n",
+               CNETERR("Error %d sending HELLO payload (%d) to %pIScp\n",
                        rc, hello->kshm_nips,
                        &conn->ksnc_peeraddr);
        }
@@ -615,7 +615,7 @@ ksocknal_send_hello_v2(struct ksock_conn *conn, struct ksock_hello_msg *hello)
                             lnet_acceptor_timeout());
        CFS_FREE_PTR(hello4);
        if (rc) {
-               CNETERR("Error %d sending HELLO hdr to %pISp\n",
+               CNETERR("Error %d sending HELLO hdr to %pIScp\n",
                        rc, &conn->ksnc_peeraddr);
                return rc;
        }
@@ -627,7 +627,7 @@ ksocknal_send_hello_v2(struct ksock_conn *conn, struct ksock_hello_msg *hello)
                             hello->kshm_nips * sizeof(__u32),
                             lnet_acceptor_timeout());
        if (rc != 0) {
-               CNETERR("Error %d sending HELLO payload (%d) to %pISp\n", rc,
+               CNETERR("Error %d sending HELLO payload (%d) to %pIScp\n", rc,
                        hello->kshm_nips,
                        &conn->ksnc_peeraddr);
        }
@@ -648,7 +648,7 @@ ksocknal_send_hello_v4(struct ksock_conn *conn, struct ksock_hello_msg *hello)
                             lnet_acceptor_timeout());
 
        if (rc != 0)
-               CNETERR("Error %d sending HELLO hdr to %pISp\n",
+               CNETERR("Error %d sending HELLO hdr to %pIScp\n",
                        rc, &conn->ksnc_peeraddr);
        return rc;
 }
@@ -673,7 +673,7 @@ ksocknal_recv_hello_v1(struct ksock_conn *conn, struct ksock_hello_msg *hello,
                                                    src_nid),
                            timeout);
        if (rc != 0) {
-               CERROR("Error %d reading rest of HELLO hdr from %pIS\n",
+               CERROR("Error %d reading rest of HELLO hdr from %pISc\n",
                       rc, &conn->ksnc_peeraddr);
                LASSERT(rc < 0 && rc != -EALREADY);
                goto out;
@@ -681,7 +681,7 @@ ksocknal_recv_hello_v1(struct ksock_conn *conn, struct ksock_hello_msg *hello,
 
        /* ...and check we got what we expected */
        if (hdr->type != cpu_to_le32 (LNET_MSG_HELLO)) {
-               CERROR("Expecting a HELLO hdr, but got type %d from %pIS\n",
+               CERROR("Expecting a HELLO hdr, but got type %d from %pISc\n",
                       le32_to_cpu(hdr->type),
                       &conn->ksnc_peeraddr);
                rc = -EPROTO;
@@ -695,7 +695,7 @@ ksocknal_recv_hello_v1(struct ksock_conn *conn, struct ksock_hello_msg *hello,
        hello->kshm_nips = le32_to_cpu(hdr->payload_length) / sizeof(__u32);
 
        if (hello->kshm_nips > LNET_INTERFACES_NUM) {
-               CERROR("Bad nips %d from ip %pIS\n",
+               CERROR("Bad nips %d from ip %pISc\n",
                       hello->kshm_nips, &conn->ksnc_peeraddr);
                rc = -EPROTO;
                goto out;
@@ -707,7 +707,7 @@ ksocknal_recv_hello_v1(struct ksock_conn *conn, struct ksock_hello_msg *hello,
        rc = lnet_sock_read(sock, hello->kshm_ips,
                            hello->kshm_nips * sizeof(__u32), timeout);
        if (rc != 0) {
-               CERROR("Error %d reading IPs from ip %pIS\n",
+               CERROR("Error %d reading IPs from ip %pISc\n",
                       rc, &conn->ksnc_peeraddr);
                LASSERT(rc < 0 && rc != -EALREADY);
                goto out;
@@ -717,7 +717,7 @@ ksocknal_recv_hello_v1(struct ksock_conn *conn, struct ksock_hello_msg *hello,
                hello->kshm_ips[i] = __le32_to_cpu(hello->kshm_ips[i]);
 
                if (hello->kshm_ips[i] == 0) {
-                       CERROR("Zero IP[%d] from ip %pIS\n",
+                       CERROR("Zero IP[%d] from ip %pISc\n",
                               i, &conn->ksnc_peeraddr);
                        rc = -EPROTO;
                        break;
@@ -748,7 +748,7 @@ ksocknal_recv_hello_v2(struct ksock_conn *conn, struct ksock_hello_msg *hello,
                            offsetof(struct ksock_hello_msg_nid4, kshm_src_nid),
                            timeout);
        if (rc != 0) {
-               CERROR("Error %d reading HELLO from %pIS\n",
+               CERROR("Error %d reading HELLO from %pISc\n",
                       rc, &conn->ksnc_peeraddr);
                LASSERT(rc < 0 && rc != -EALREADY);
                return rc;
@@ -777,7 +777,7 @@ ksocknal_recv_hello_v2(struct ksock_conn *conn, struct ksock_hello_msg *hello,
        }
 
        if (hello->kshm_nips > LNET_INTERFACES_NUM) {
-               CERROR("Bad nips %d from ip %pIS\n",
+               CERROR("Bad nips %d from ip %pISc\n",
                       hello->kshm_nips, &conn->ksnc_peeraddr);
                return -EPROTO;
        }
@@ -788,7 +788,7 @@ ksocknal_recv_hello_v2(struct ksock_conn *conn, struct ksock_hello_msg *hello,
        rc = lnet_sock_read(sock, hello->kshm_ips,
                            hello->kshm_nips * sizeof(__u32), timeout);
        if (rc != 0) {
-               CERROR("Error %d reading IPs from ip %pIS\n",
+               CERROR("Error %d reading IPs from ip %pISc\n",
                       rc, &conn->ksnc_peeraddr);
                LASSERT(rc < 0 && rc != -EALREADY);
                return rc;
@@ -799,7 +799,7 @@ ksocknal_recv_hello_v2(struct ksock_conn *conn, struct ksock_hello_msg *hello,
                        __swab32s(&hello->kshm_ips[i]);
 
                if (hello->kshm_ips[i] == 0) {
-                       CERROR("Zero IP[%d] from ip %pIS\n",
+                       CERROR("Zero IP[%d] from ip %pISc\n",
                               i, &conn->ksnc_peeraddr);
                        return -EPROTO;
                }
@@ -825,7 +825,7 @@ ksocknal_recv_hello_v4(struct ksock_conn *conn, struct ksock_hello_msg *hello,
                            offsetof(struct ksock_hello_msg, kshm_src_nid),
                            timeout);
        if (rc) {
-               CERROR("Error %d reading HELLO from %pIS\n",
+               CERROR("Error %d reading HELLO from %pISc\n",
                       rc, &conn->ksnc_peeraddr);
                LASSERT(rc < 0 && rc != -EALREADY);
                return rc;