[lustre-devel] [PATCH 07/24] lnet: change lp_disc_*_nid to struct lnet_nid
James Simmons
jsimmons at infradead.org
Tue Sep 21 19:19:44 PDT 2021
From: Mr NeilBrown <neilb at suse.de>
Change lp_disc_src_nid and lp_disc_dst_nid in struct lnet_peer to
struct lnet_nid.
WC-bug-id: https://jira.whamcloud.com/browse/LU-10391
Lustre-commit: f38529cd3a1722119 ("LU-10391 lnet: change lp_disc_*_nid to struct lnet_nid")
Signed-off-by: Mr NeilBrown <neilb at suse.de>
Reviewed-on: https://review.whamcloud.com/44620
Reviewed-by: James Simmons <jsimmons at infradead.org>
Reviewed-by: Chris Horn <chris.horn at hpe.com>
Reviewed-by: Serguei Smirnov <ssmirnov at whamcloud.com>
Reviewed-by: Oleg Drokin <green at whamcloud.com>
Signed-off-by: James Simmons <jsimmons at infradead.org>
---
include/linux/lnet/lib-types.h | 4 ++--
net/lnet/lnet/peer.c | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/linux/lnet/lib-types.h b/include/linux/lnet/lib-types.h
index f980f2f..ba900e8 100644
--- a/include/linux/lnet/lib-types.h
+++ b/include/linux/lnet/lib-types.h
@@ -672,9 +672,9 @@ struct lnet_peer {
struct lnet_nid lp_primary_nid;
/* source NID to use during discovery */
- lnet_nid_t lp_disc_src_nid;
+ struct lnet_nid lp_disc_src_nid;
/* destination NID to use during discovery */
- lnet_nid_t lp_disc_dst_nid;
+ struct lnet_nid lp_disc_dst_nid;
/* net to perform discovery on */
u32 lp_disc_net_id;
diff --git a/net/lnet/lnet/peer.c b/net/lnet/lnet/peer.c
index 7f2c6f3..17f99ee 100644
--- a/net/lnet/lnet/peer.c
+++ b/net/lnet/lnet/peer.c
@@ -224,8 +224,8 @@
init_waitqueue_head(&lp->lp_dc_waitq);
spin_lock_init(&lp->lp_lock);
lp->lp_primary_nid = nid;
- lp->lp_disc_src_nid = LNET_NID_ANY;
- lp->lp_disc_dst_nid = LNET_NID_ANY;
+ lp->lp_disc_src_nid = LNET_ANY_NID;
+ lp->lp_disc_dst_nid = LNET_ANY_NID;
if (lnet_peers_start_down())
lp->lp_alive = false;
else
@@ -2635,8 +2635,8 @@ static void lnet_peer_clear_discovery_error(struct lnet_peer *lp)
spin_lock(&lp->lp_lock);
- lp->lp_disc_src_nid = ev->target.nid;
- lp->lp_disc_dst_nid = ev->source.nid;
+ lnet_nid4_to_nid(ev->target.nid, &lp->lp_disc_src_nid);
+ lnet_nid4_to_nid(ev->source.nid, &lp->lp_disc_dst_nid);
/*
* If some kind of error happened the contents of message
@@ -3367,7 +3367,7 @@ static int lnet_peer_data_present(struct lnet_peer *lp)
* received by lp, we need to set the discovery source
* NID for new_lp to the NID stored in lp.
*/
- if (lp->lp_disc_src_nid != LNET_NID_ANY) {
+ if (!LNET_NID_IS_ANY(&lp->lp_disc_src_nid)) {
new_lp->lp_disc_src_nid = lp->lp_disc_src_nid;
new_lp->lp_disc_dst_nid = lp->lp_disc_dst_nid;
}
@@ -3567,13 +3567,13 @@ static int lnet_peer_send_push(struct lnet_peer *lp)
/* Refcount for MD. */
lnet_peer_addref_locked(lp);
id.pid = LNET_PID_LUSTRE;
- if (lp->lp_disc_dst_nid != LNET_NID_ANY)
- id.nid = lp->lp_disc_dst_nid;
+ if (!LNET_NID_IS_ANY(&lp->lp_disc_dst_nid))
+ id.nid = lnet_nid_to_nid4(&lp->lp_disc_dst_nid);
else
id.nid = lnet_nid_to_nid4(&lp->lp_primary_nid);
lnet_net_unlock(cpt);
- rc = LNetPut(lp->lp_disc_src_nid, lp->lp_push_mdh,
+ rc = LNetPut(lnet_nid_to_nid4(&lp->lp_disc_src_nid), lp->lp_push_mdh,
LNET_ACK_REQ, id, LNET_RESERVED_PORTAL,
LNET_PROTO_PING_MATCHBITS, 0, 0);
/* reset the discovery nid. There is no need to restrict sending
@@ -3581,8 +3581,8 @@ static int lnet_peer_send_push(struct lnet_peer *lp)
* get set to a specific NID, if we initiate discovery from the
* scratch
*/
- lp->lp_disc_src_nid = LNET_NID_ANY;
- lp->lp_disc_dst_nid = LNET_NID_ANY;
+ lp->lp_disc_src_nid = LNET_ANY_NID;
+ lp->lp_disc_dst_nid = LNET_ANY_NID;
if (rc)
goto fail_unlink;
--
1.8.3.1
More information about the lustre-devel
mailing list