LU-10391 lnet: use large nids in struct lnet_event

[fs/lustre-release.git] / lustre / ptlrpc / events.c

diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index 7d4a157..06e4aad 100644 (file)
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -219,7 +219,7 @@ void client_bulk_callback(struct lnet_event *ev)
 
        if (ev->type != LNET_EVENT_UNLINK && ev->status == 0) {
                desc->bd_nob_transferred += ev->mlength;
-               desc->bd_sender = ev->sender;
+               desc->bd_sender = lnet_nid_to_nid4(&ev->sender);
        } else {
                /* start reconnect and resend if network error hit */
                spin_lock(&req->rq_lock);
@@ -330,14 +330,13 @@ void request_in_callback(struct lnet_event *ev)
                if (ev->status != 0) /* We moaned above already... */
                        return;
                req = ptlrpc_request_cache_alloc(GFP_ATOMIC);
-                if (req == NULL) {
-                        CERROR("Can't allocate incoming request descriptor: "
-                               "Dropping %s RPC from %s\n",
-                               service->srv_name,
-                               libcfs_id2str(ev->initiator));
-                        return;
-                }
-        }
+               if (req == NULL) {
+                       CERROR("Can't allocate incoming request descriptor: Dropping %s RPC from %s\n",
+                               service->srv_name,
+                               libcfs_idstr(&ev->initiator));
+                       return;
+               }
+       }
 
        ptlrpc_srv_req_init(req);
        /* NB we ABSOLUTELY RELY on req being zeroed, so pointers are NULL,
@@ -349,9 +348,9 @@ void request_in_callback(struct lnet_event *ev)
                req->rq_reqdata_len = ev->mlength;
        ktime_get_real_ts64(&req->rq_arrival_time);
        /* Multi-Rail: keep track of both initiator and source NID. */
-       req->rq_peer = ev->initiator;
-       req->rq_source = ev->source;
-       req->rq_self = ev->target.nid;
+       req->rq_peer = lnet_pid_to_pid4(&ev->initiator);
+       req->rq_source = lnet_pid_to_pid4(&ev->source);
+       req->rq_self = lnet_nid_to_nid4(&ev->target.nid);
        req->rq_rqbd = rqbd;
        req->rq_phase = RQ_PHASE_NEW;
        if (ev->type == LNET_EVENT_PUT)
@@ -487,7 +486,7 @@ void server_bulk_callback(struct lnet_event *ev)
                 * before the SENT event (oh yes we can), we know we
                 * read/wrote the peer buffer and how much... */
                desc->bd_nob_transferred += ev->mlength;
-               desc->bd_sender = ev->sender;
+               desc->bd_sender = lnet_nid_to_nid4(&ev->sender);
        }
 
        if (ev->status != 0)