From 094ae18ed8a995a1323833054bdfed613fa884c5 Mon Sep 17 00:00:00 2001 From: Frank Sehr Date: Fri, 16 Jun 2023 12:36:33 -0700 Subject: [PATCH] LU-16548 lnet: Fixing missing gnilnd define CURRENT_LND_VERSION Added missing define CURRENT_LND_VERSION for gni. Declared kgnilnd_tunables_setup. Test-Parameters: trivial Signed-off-by: Frank Sehr Change-Id: Ia327dcbdaa518a24a60e32b1dcb37c5b1d0dc78e Fixes: 56097c4904 ("LU-16548 lnet: report actual timeout used by lnd") Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51342 Reviewed-by: Chris Horn Reviewed-by: Oleg Drokin Reviewed-by: Shaun Tancheff Tested-by: Maloo Tested-by: jenkins --- lnet/klnds/gnilnd/gnilnd.h | 2 ++ lnet/klnds/gnilnd/gnilnd_modparams.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lnet/klnds/gnilnd/gnilnd.h b/lnet/klnds/gnilnd/gnilnd.h index bb1ccd7..91c5f14 100644 --- a/lnet/klnds/gnilnd/gnilnd.h +++ b/lnet/klnds/gnilnd/gnilnd.h @@ -1862,7 +1862,9 @@ void kgnilnd_wakeup_rca_thread(void); int kgnilnd_start_rca_thread(void); int kgnilnd_get_node_state(__u32 nid); +int kgnilnd_tunables_setup(struct lnet_ni *ni); int kgnilnd_tunables_init(void); + void kgnilnd_init_msg(kgn_msg_t *msg, int type, lnet_nid_t source); void kgnilnd_bump_timeouts(__u32 nap_time, char *reason); diff --git a/lnet/klnds/gnilnd/gnilnd_modparams.c b/lnet/klnds/gnilnd/gnilnd_modparams.c index 46a2b25..c1814a6 100644 --- a/lnet/klnds/gnilnd/gnilnd_modparams.c +++ b/lnet/klnds/gnilnd/gnilnd_modparams.c @@ -25,6 +25,8 @@ #include "gnilnd.h" +#define CURRENT_LND_VERSION 1 + static int credits = GNILND_DEFAULT_CREDITS; module_param(credits, int, 0444); MODULE_PARM_DESC(credits, "# concurrent sends"); @@ -311,8 +313,8 @@ out: return rc; } -void -kgninal_tunables_setup(struct lnet_ni *ni) +int +kgnilnd_tunables_setup(struct lnet_ni *ni) { struct lnet_ioctl_config_gnilnd_tunables *tunables; @@ -328,4 +330,6 @@ kgninal_tunables_setup(struct lnet_ni *ni) tunables->lnd_version = CURRENT_LND_VERSION; tunables->lnd_timeout = kgnilnd_timeout(); + + return 0; } -- 1.8.3.1