From 5e455d823e64d100f85b9f53da0a68ec832ac9e1 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Thu, 24 Apr 2025 19:03:57 -0400 Subject: [PATCH] LU-12511 lnet: don't build gnilnd related code for native client The gnilnd is not upstream so avoid the code for native client builds. Test-Parameters: trivial Change-Id: I48015da55f2ea8823838a00ca618c9bd1716b7c3 Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58953 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Shaun Tancheff Reviewed-by: Chris Horn Reviewed-by: Oleg Drokin --- config/lustre-lnet.m4 | 1 + lnet/utils/lnetconfig/liblnetconfig_lnd.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/config/lustre-lnet.m4 b/config/lustre-lnet.m4 index 22c96f3..bc791e8 100644 --- a/config/lustre-lnet.m4 +++ b/config/lustre-lnet.m4 @@ -945,6 +945,7 @@ AS_IF([test "x$enable_gni" = xyes], [ ]) EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save" + AC_DEFINE(HAVE_GNILND, 1, [support gemini LND]) AC_SUBST(ENABLE_GNI, yes) ], [ AC_SUBST(ENABLE_GNI, no) diff --git a/lnet/utils/lnetconfig/liblnetconfig_lnd.c b/lnet/utils/lnetconfig/liblnetconfig_lnd.c index a6b8597..eae400c 100644 --- a/lnet/utils/lnetconfig/liblnetconfig_lnd.c +++ b/lnet/utils/lnetconfig/liblnetconfig_lnd.c @@ -122,6 +122,7 @@ lustre_kfilnd_show_tun(struct cYAML *lndparams, } #endif +#ifdef HAVE_GNILND static int lustre_gnilnd_show_tun(struct cYAML *lndparams, struct lnet_ioctl_config_gnilnd_tunables *lnd_cfg) @@ -132,6 +133,7 @@ lustre_gnilnd_show_tun(struct cYAML *lndparams, return LUSTRE_CFG_RC_NO_ERR; } +#endif int lustre_net_show_tunables(struct cYAML *tunables, @@ -184,9 +186,11 @@ lustre_ni_show_tunables(struct cYAML *lnd_tunables, &lnd->lnd_tun_u.lnd_kfi, backup); #endif +#ifdef HAVE_GNILND else if (net_type == GNILND) rc = lustre_gnilnd_show_tun(lnd_tunables, &lnd->lnd_tun_u.lnd_gni); +#endif return rc; } -- 1.8.3.1