diff options
| author | Yaniv Kaul <ykaul@redhat.com> | 2019-12-03 12:57:13 +0200 |
|---|---|---|
| committer | Amar Tumballi <amarts@gmail.com> | 2019-12-18 03:47:42 +0000 |
| commit | 194e4216c8e30612f96f8f3712fdb3f1c96b3a08 (patch) | |
| tree | de825272940d753f129b43187837f7f5c3584d69 /xlators/mgmt/glusterd/src/glusterd-ganesha.c | |
| parent | 6f6b253deed134c5fee37e1e3d2fd44b18e1db6e (diff) | |
[RFC]#ifdef gNFS related code if we are not compiling gNFS
If we are not compiling gNFS (--enable-gnfs is not given in the
./configure script params), there is little point in compiling code
that is related to it.
This patch tries to eliminate it.
My hope (and it's not clear from the code ) is that I did not break
the NFS Ganesha support as well.
Other than that, tried to compile with and without anad it looks sane.
Change-Id: I8d6c98066b9fceab4ec10fc6f5e81ab069e853bd
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-ganesha.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-ganesha.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c index caba34f5489..0c18cc45b07 100644 --- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c +++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c @@ -13,7 +13,6 @@ #include "glusterd-op-sm.h" #include "glusterd-store.h" #include "glusterd-utils.h" -#include "glusterd-nfs-svc.h" #include "glusterd-volgen.h" #include "glusterd-messages.h" #include <glusterfs/syscall.h> @@ -793,12 +792,13 @@ start_ganesha(char **op_errstr) cds_list_for_each_entry(volinfo, &priv->volumes, vol_list) { vol_opts = volinfo->dict; +#ifdef BUILD_GNFS /* Gluster-nfs has to be disabled across the trusted pool */ /* before attempting to start nfs-ganesha */ ret = dict_set_str(vol_opts, NFS_DISABLE_MAP_KEY, "on"); if (ret) goto out; - +#endif ret = glusterd_store_volinfo(volinfo, GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) { |