From be673d9d093d977f4f38f2dba3f422c796db37b7 Mon Sep 17 00:00:00 2001 From: Yaniv Kaul Date: Wed, 22 Jan 2020 15:50:27 +0200 Subject: multiple files: ensure nfs_svc functions are available When gNFS is disabled in build time, we have to ensure taht the .stop(), .start() and other functions of the nfs_svc are not called, otherwise we'd crash. In addition, #ifdef more code that is gNFS related. updates: bz#1793995 Signed-off-by: Yaniv Kaul Change-Id: I5081f1670c04ca306aeaab7208829b0f2f149a42 --- xlators/mgmt/glusterd/src/glusterd-utils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 44367922876..57ff41d0595 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -5471,10 +5471,12 @@ glusterd_add_node_to_dict(char *server, dict_t *dict, int count, glusterd_svc_build_pidfile_path(server, priv->rundir, pidfile, sizeof(pidfile)); - if (strcmp(server, priv->nfs_svc.name) == 0) - svc = &(priv->nfs_svc); - else if (strcmp(server, priv->quotad_svc.name) == 0) + if (strcmp(server, priv->quotad_svc.name) == 0) svc = &(priv->quotad_svc); +#ifdef BUILD_GNFS + else if (strcmp(server, priv->nfs_svc.name) == 0) + svc = &(priv->nfs_svc); +#endif else if (strcmp(server, priv->bitd_svc.name) == 0) svc = &(priv->bitd_svc); else if (strcmp(server, priv->scrub_svc.name) == 0) -- cgit