From: Shaun Tancheff Date: Sun, 18 Jun 2023 02:39:00 +0000 (+0700) Subject: LU-16899 gnilnd: Use libcfs_nidstr and fix typo X-Git-Tag: 2.15.57~86 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9190af53287b4921ae30fdf55a8f2a32983d8f0b;p=fs%2Flustre-release.git LU-16899 gnilnd: Use libcfs_nidstr and fix typo CDEBUG() in kgnilnd_peer_notify() should use libcfs_nidstr() kgnilnd_finish_connect() has a typo in lnet_notify() where peer_nid was intended. Test-Parameters: trivial Fixes: 4a88236f40 ("LU-10391 lnet: change lnet_notify() to take struct lnet_nid") Signed-off-by: Shaun Tancheff Change-Id: If45a28b654e27aa34b655fefaea142dc740fa46f Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51330 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Chris Horn Reviewed-by: Neil Brown Reviewed-by: Oleg Drokin --- diff --git a/lnet/klnds/gnilnd/gnilnd.c b/lnet/klnds/gnilnd/gnilnd.c index 62d578a..dbb8f0b 100644 --- a/lnet/klnds/gnilnd/gnilnd.c +++ b/lnet/klnds/gnilnd/gnilnd.c @@ -602,7 +602,8 @@ kgnilnd_peer_notify(kgn_peer_t *peer, int error, int alive) &peer_nid); CDEBUG(D_NET, "peer 0x%p->%s last_alive %lld (%llds ago)\n", - peer, libcfs_nid2str(peer_nid), peer->gnp_last_alive, + peer, libcfs_nidstr(&peer_nid), + peer->gnp_last_alive, ktime_get_seconds() - peer->gnp_last_alive); lnet_notify(net->gnn_ni, &peer_nid, alive, true, diff --git a/lnet/klnds/gnilnd/gnilnd_conn.c b/lnet/klnds/gnilnd/gnilnd_conn.c index f887762..5159248 100644 --- a/lnet/klnds/gnilnd/gnilnd_conn.c +++ b/lnet/klnds/gnilnd/gnilnd_conn.c @@ -1952,7 +1952,7 @@ kgnilnd_finish_connect(kgn_dgram_t *dgram) * This is a Cray extension to the "standard" LND behavior. */ lnet_nid4_to_nid(peer->gnp_nid, &peer_nid); - lnet_notify(peer->gnp_net->gnn_ni, &peed_nid, true, true, + lnet_notify(peer->gnp_net->gnn_ni, &peer_nid, true, true, ktime_get_seconds()); /* drop our 'hold' ref */