LU-10391 lnet: switch to large lnet_processid for matching

[fs/lustre-release.git] / lnet / lnet / lib-move.c

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index 0b3c922..3259946 100644 (file)
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -4165,7 +4165,7 @@ lnet_parse_put(struct lnet_ni *ni, struct lnet_msg *msg)
        hdr->msg.put.offset     = le32_to_cpu(hdr->msg.put.offset);
 
        /* Primary peer NID. */
        hdr->msg.put.offset     = le32_to_cpu(hdr->msg.put.offset);
 
        /* Primary peer NID. */

-       info.mi_id.nid  = msg->msg_initiator;
+       lnet_nid4_to_nid(msg->msg_initiator, &info.mi_id.nid);

        info.mi_id.pid  = hdr->src_pid;
        info.mi_opc     = LNET_MD_OP_PUT;
        info.mi_portal  = hdr->msg.put.ptl_index;
        info.mi_id.pid  = hdr->src_pid;
        info.mi_opc     = LNET_MD_OP_PUT;
        info.mi_portal  = hdr->msg.put.ptl_index;


@@ -4203,7 +4203,7 @@ lnet_parse_put(struct lnet_ni *ni, struct lnet_msg *msg)
        case LNET_MATCHMD_DROP:
                CNETERR("Dropping PUT from %s portal %d match %llu"
                        " offset %d length %d: %d\n",
        case LNET_MATCHMD_DROP:
                CNETERR("Dropping PUT from %s portal %d match %llu"
                        " offset %d length %d: %d\n",

-                       libcfs_id2str(info.mi_id), info.mi_portal,
+                       libcfs_idstr(&info.mi_id), info.mi_portal,

                        info.mi_mbits, info.mi_roffset, info.mi_rlength, rc);
 
                return -ENOENT; /* -ve: OK but no match */
                        info.mi_mbits, info.mi_roffset, info.mi_rlength, rc);
 
                return -ENOENT; /* -ve: OK but no match */


@@ -4228,7 +4228,7 @@ lnet_parse_get(struct lnet_ni *ni, struct lnet_msg *msg, int rdma_get)
        source_id.nid = hdr->src_nid;
        source_id.pid = hdr->src_pid;
        /* Primary peer NID */
        source_id.nid = hdr->src_nid;
        source_id.pid = hdr->src_pid;
        /* Primary peer NID */

-       info.mi_id.nid  = msg->msg_initiator;
+       lnet_nid4_to_nid(msg->msg_initiator, &info.mi_id.nid);

        info.mi_id.pid  = hdr->src_pid;
        info.mi_opc     = LNET_MD_OP_GET;
        info.mi_portal  = hdr->msg.get.ptl_index;
        info.mi_id.pid  = hdr->src_pid;
        info.mi_opc     = LNET_MD_OP_GET;
        info.mi_portal  = hdr->msg.get.ptl_index;


@@ -4241,7 +4241,7 @@ lnet_parse_get(struct lnet_ni *ni, struct lnet_msg *msg, int rdma_get)
        if (rc == LNET_MATCHMD_DROP) {
                CNETERR("Dropping GET from %s portal %d match %llu"
                        " offset %d length %d\n",
        if (rc == LNET_MATCHMD_DROP) {
                CNETERR("Dropping GET from %s portal %d match %llu"
                        " offset %d length %d\n",

-                       libcfs_id2str(info.mi_id), info.mi_portal,
+                       libcfs_idstr(&info.mi_id), info.mi_portal,

                        info.mi_mbits, info.mi_roffset, info.mi_rlength);
                return -ENOENT; /* -ve: OK but no match */
        }
                        info.mi_mbits, info.mi_roffset, info.mi_rlength);
                return -ENOENT; /* -ve: OK but no match */
        }


@@ -4273,7 +4273,7 @@ lnet_parse_get(struct lnet_ni *ni, struct lnet_msg *msg, int rdma_get)
                /* didn't get as far as lnet_ni_send() */
                CERROR("%s: Unable to send REPLY for GET from %s: %d\n",
                       libcfs_nidstr(&ni->ni_nid),
                /* didn't get as far as lnet_ni_send() */
                CERROR("%s: Unable to send REPLY for GET from %s: %d\n",
                       libcfs_nidstr(&ni->ni_nid),

-                      libcfs_id2str(info.mi_id), rc);
+                      libcfs_idstr(&info.mi_id), rc);

 
                lnet_finalize(msg, rc);
        }
 
                lnet_finalize(msg, rc);
        }