From: Serguei Smirnov <ssmirnov@whamcloud.com>
Date: Tue, 30 Apr 2024 17:55:29 +0000 (-0700)
Subject: LU-17795 lnet: unused return code in lnet_peer_data_present
X-Git-Tag: 2.15.64~206
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=8616409ce9bc7237d36183ca3be3e0c41225a596;p=fs%2Flustre-release.git

LU-17795 lnet: unused return code in lnet_peer_data_present

Coverity check detected an issue with the return code from the call to
lnet_peer_set_primary_nid() in the code added by LU-17379 patch.
Fix it.

Test-Parameters: trivial testlist=sanity-lnet
Fixes: ae6d37 ("LU-17379 lnet: parallelize peer discovery via LNetAddPeer")
Signed-off-by: Serguei Smirnov <ssmirnov@whamcloud.com>
Change-Id: I8b9df330200ff2732efd2a54d8de910463993fae
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54971
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Frank Sehr <fsehr@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c
index 1e6d0f1..9c3d4e1 100644
--- a/lnet/lnet/peer.c
+++ b/lnet/lnet/peer.c
@@ -1365,7 +1365,6 @@ LNetAddPeer(struct lnet_nid *nids, u32 num_nids)
 	mr = lnet_peer_discovery_disabled == 0;
 
 	rc = 0;
-	CDEBUG(D_NET, "num_nids %d\n", num_nids);
 
 	for (i = 0; i < num_nids; i++) {
 		if (nid_is_lo0(&nids[i]))
@@ -3649,8 +3648,8 @@ __must_hold(&lp->lp_lock)
 	 */
 	if (!LNET_NID_IS_ANY(&lp->lp_merge_primary_nid)) {
 
-		rc = lnet_peer_set_primary_nid(lp, &lp->lp_merge_primary_nid,
-					       flags);
+		lnet_peer_set_primary_nid(lp, &lp->lp_merge_primary_nid,
+					  flags);
 		lp->lp_merge_primary_nid = LNET_ANY_NID;
 	}