From ad30945aebd5fa8f86e574c06b143f1cc77d1af0 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Thu, 28 Mar 2024 01:11:45 -0700 Subject: [PATCH] LU-8191 lnet: remove unused, fix non-static functions Static analysis shows that a number of functions could be made static. This patch also declares several functions in lnet static. Lustre-change: https://review.whamcloud.com/51436 Lustre-commit: 43cbc93f1edc493e47fe5c4059bf0bae6a20c207 It is wrong to remove lnet_selftest_structure_assertion() since it contained BUILD_BUGs used to ensure different LNet Selftest versions can interoperate. Add a dummy user for lnet_selftest_structure_assertion() in LNet Selftest init. This should prevent analyzers from picking this up as an unused function. Lustre-change: https://review.whamcloud.com/54635 Lustre-commit: TBD (from ed2a2286d17a7d23b86a87094d1eb2abac8ea015) Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: Ie1b49c5652553715cd9f96b56090d33a95e3b438 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54604 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lnet/klnds/o2iblnd/o2iblnd.c | 2 +- lnet/klnds/o2iblnd/o2iblnd_cb.c | 2 +- lnet/klnds/socklnd/socklnd.c | 2 +- lnet/lnet/api-ni.c | 6 +++--- lnet/lnet/lib-move.c | 4 ++-- lnet/lnet/lib-msg.c | 4 ++-- lnet/lnet/peer.c | 4 ++-- lnet/selftest/module.c | 6 ++++++ 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c index ae5fd34..fb5a275 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.c +++ b/lnet/klnds/o2iblnd/o2iblnd.c @@ -2578,7 +2578,7 @@ kiblnd_set_ni_fatal_on(struct kib_hca_dev *hdev, int val) lnet_mark_ping_buffer_for_update(); } -void +static void kiblnd_event_handler(struct ib_event_handler *handler, struct ib_event *event) { rwlock_t *g_lock = &kiblnd_data.kib_global_lock; diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c index b31cd1b..f0e28d8 100644 --- a/lnet/klnds/o2iblnd/o2iblnd_cb.c +++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c @@ -54,7 +54,7 @@ static void kiblnd_queue_tx(struct kib_tx *tx, struct kib_conn *conn); static void kiblnd_unmap_tx(struct kib_tx *tx); static void kiblnd_check_sends_locked(struct kib_conn *conn); -void +static void kiblnd_tx_done(struct kib_tx *tx) { struct lnet_msg *lntmsg[2]; diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c index b3e2338..df79d6ad 100644 --- a/lnet/klnds/socklnd/socklnd.c +++ b/lnet/klnds/socklnd/socklnd.c @@ -1564,7 +1564,7 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr) return (count == 0 ? -ENOENT : 0); } -void +static void ksocknal_notify_gw_down(lnet_nid_t gw_nid) { /* The router is telling me she's been notified of a change in diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index 45f3d89..cc5afb0 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -3059,7 +3059,7 @@ lnet_get_next_ni_locked(struct lnet_net *mynet, struct lnet_ni *prev) return ni; } -int +static int lnet_get_net_config(struct lnet_ioctl_config_data *config) { struct lnet_ni *ni; @@ -3082,7 +3082,7 @@ lnet_get_net_config(struct lnet_ioctl_config_data *config) return rc; } -int +static int lnet_get_ni_config(struct lnet_ioctl_config_ni *cfg_ni, struct lnet_ioctl_config_lnd_tunables *tun, struct lnet_ioctl_element_stats *stats, @@ -3110,7 +3110,7 @@ lnet_get_ni_config(struct lnet_ioctl_config_ni *cfg_ni, return rc; } -int lnet_get_ni_stats(struct lnet_ioctl_element_msg_stats *msg_stats) +static int lnet_get_ni_stats(struct lnet_ioctl_element_msg_stats *msg_stats) { struct lnet_ni *ni; int cpt; diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index 20cf75e..aa7ea81 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -2027,7 +2027,7 @@ lnet_handle_spec_local_mr_dst(struct lnet_send_data *sd) return -EHOSTUNREACH; } -struct lnet_ni * +static struct lnet_ni * lnet_find_best_ni_on_spec_net(struct lnet_ni *cur_best_ni, struct lnet_peer *peer, struct lnet_peer_net *peer_net, @@ -2369,7 +2369,7 @@ lnet_handle_spec_router_dst(struct lnet_send_data *sd) return lnet_handle_send(sd); } -struct lnet_ni * +static struct lnet_ni * lnet_find_best_ni_on_local_net(struct lnet_peer *peer, struct lnet_msg *msg, int md_cpt, bool discovery) { diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c index c008456..82d7a2e 100644 --- a/lnet/lnet/lib-msg.c +++ b/lnet/lnet/lib-msg.c @@ -651,7 +651,7 @@ lnet_resend_msg_locked(struct lnet_msg *msg) complete(&the_lnet.ln_mt_wait_complete); } -int +static int lnet_check_finalize_recursion_locked(struct lnet_msg *msg, struct list_head *containerq, int nworkers, void **workers) @@ -677,7 +677,7 @@ lnet_check_finalize_recursion_locked(struct lnet_msg *msg, return my_slot; } -int +static int lnet_attempt_msg_resend(struct lnet_msg *msg) { struct lnet_msg_container *container; diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c index 31349f9..d47f896 100644 --- a/lnet/lnet/peer.c +++ b/lnet/lnet/peer.c @@ -1001,7 +1001,7 @@ lnet_peer_ni_set_non_mr_pref_nid(struct lnet_peer_ni *lpni, lnet_nid_t nid) * Clear the preferred NID from a non-multi-rail peer_ni, provided * this preference was set by lnet_peer_ni_set_non_mr_pref_nid(). */ -int +static int lnet_peer_ni_clr_non_mr_pref_nid(struct lnet_peer_ni *lpni) { int rc = 0; @@ -1025,7 +1025,7 @@ lnet_peer_ni_clr_non_mr_pref_nid(struct lnet_peer_ni *lpni) /* * Clear the preferred NIDs from a non-multi-rail peer. */ -void +static void lnet_peer_clr_non_mr_pref_nids(struct lnet_peer *lp) { struct lnet_peer_ni *lpni = NULL; diff --git a/lnet/selftest/module.c b/lnet/selftest/module.c index 64cb935..6a4ecbd 100644 --- a/lnet/selftest/module.c +++ b/lnet/selftest/module.c @@ -106,6 +106,12 @@ lnet_selftest_init(void) int rc; int i; + /* This assertion checks that struct sizes do not drift + * inadvertently and induce crashes when different nodes + * running LNet Selftest have mismatched structures. + */ + lnet_selftest_structure_assertion(); + rc = cfs_wi_sched_create("lst_s", lnet_cpt_table(), CFS_CPT_ANY, 1, &lst_sched_serial); if (rc != 0) { -- 1.8.3.1