LU-10391 lnet: introduce struct lnet_nid

[fs/lustre-release.git] / lnet / lnet / router.c

diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c
index 50441b3..b75a515 100644 (file)
--- a/lnet/lnet/router.c
+++ b/lnet/lnet/router.c
@@ -1715,23 +1715,22 @@ lnet_notify(struct lnet_ni *ni, lnet_nid_t nid, bool alive, bool reset,
        LASSERT(!in_interrupt());
 
        CDEBUG(D_NET, "%s notifying %s: %s\n",
-              (ni == NULL) ? "userspace" : libcfs_nid2str(ni->ni_nid),
+              (ni == NULL) ? "userspace" : libcfs_nidstr(&ni->ni_nid),
               libcfs_nid2str(nid), alive ? "up" : "down");
 
        if (ni != NULL &&
-           LNET_NIDNET(ni->ni_nid) != LNET_NIDNET(nid)) {
+           LNET_NID_NET(&ni->ni_nid) != LNET_NIDNET(nid)) {
                CWARN("Ignoring notification of %s %s by %s (different net)\n",
                      libcfs_nid2str(nid), alive ? "birth" : "death",
-                     libcfs_nid2str(ni->ni_nid));
+                     libcfs_nidstr(&ni->ni_nid));
                return -EINVAL;
        }
 
        /* can't do predictions... */
        if (when > now) {
-               CWARN("Ignoring prediction from %s of %s %s "
-                     "%lld seconds in the future\n",
-                     (ni == NULL) ? "userspace" : libcfs_nid2str(ni->ni_nid),
-                     libcfs_nid2str(nid), alive ? "up" : "down", when - now);
+               CWARN("Ignoring prediction from %s of %s %s %lld seconds in the future\n",
+                       ni ? libcfs_nidstr(&ni->ni_nid) :  "userspace",
+                       libcfs_nid2str(nid), alive ? "up" : "down", when - now);
                return -EINVAL;
        }