summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--glusterfs.spec.in4
-rw-r--r--xlators/features/Makefile.am2
-rw-r--r--xlators/features/ganesha/Makefile.am3
-rw-r--r--xlators/features/ganesha/src/Makefile.am18
-rw-r--r--xlators/features/ganesha/src/ganesha-mem-types.h21
-rw-r--r--xlators/features/ganesha/src/ganesha.c90
-rw-r--r--xlators/features/ganesha/src/ganesha.h18
8 files changed, 4 insertions, 154 deletions
diff --git a/configure.ac b/configure.ac
index 69b426f..5731859 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,8 +150,6 @@ AC_CONFIG_FILES([Makefile
xlators/features/quiesce/src/Makefile
xlators/features/barrier/Makefile
xlators/features/barrier/src/Makefile
- xlators/features/ganesha/Makefile
- xlators/features/ganesha/src/Makefile
xlators/features/index/Makefile
xlators/features/index/src/Makefile
xlators/features/protect/Makefile
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 56b1868..6e681ee 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -991,7 +991,6 @@ exit 0
%files client-xlators
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/pump.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/ganesha.so
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/dht2c.so
@@ -1236,6 +1235,9 @@ exit 0
%endif
%changelog
+* Thu Aug 4 2016 Jiffin Tony Thottan <jthottan@redhat.com>
+- Remove ganesha.so from client xlators
+
* Sun Jul 31 2016 Soumya Koduri <skoduri@redhat.com>
- Add dependency on portblock resource agent for ganesha package (#1354439)
diff --git a/xlators/features/Makefile.am b/xlators/features/Makefile.am
index c63eb75..68dc38b 100644
--- a/xlators/features/Makefile.am
+++ b/xlators/features/Makefile.am
@@ -1,5 +1,5 @@
SUBDIRS = locks quota read-only mac-compat quiesce marker index barrier \
- arbiter protect compress changelog changetimerecorder ganesha \
+ arbiter protect compress changelog changetimerecorder \
gfid-access $(GLUPY_SUBDIR) upcall snapview-client snapview-server \
trash shard bit-rot leases
diff --git a/xlators/features/ganesha/Makefile.am b/xlators/features/ganesha/Makefile.am
deleted file mode 100644
index a985f42..0000000
--- a/xlators/features/ganesha/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = src
-
-CLEANFILES =
diff --git a/xlators/features/ganesha/src/Makefile.am b/xlators/features/ganesha/src/Makefile.am
deleted file mode 100644
index 3bf291b..0000000
--- a/xlators/features/ganesha/src/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-xlator_LTLIBRARIES = ganesha.la
-
-xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
-
-noinst_HEADERS = ganesha.h ganesha-mem-types.h
-
-ganesha_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS)
-
-ganesha_la_SOURCES = ganesha.c
-
-AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
- -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\
- -DGANESHA_DIR=\"$(sysconfdir)/ganesha\" \
- -DGYSNCD_PREFIX=\"$(libexecdir)/glusterfs\"
-
-AM_CFLAGS = -Wall $(GF_CFLAGS)
-
-CLEANFILES =
diff --git a/xlators/features/ganesha/src/ganesha-mem-types.h b/xlators/features/ganesha/src/ganesha-mem-types.h
deleted file mode 100644
index c4976c0..0000000
--- a/xlators/features/ganesha/src/ganesha-mem-types.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com>
- This file is part of GlusterFS.
-
- This file is licensed to you under your choice of the GNU Lesser
- General Public License, version 3 or any later version (LGPLv3 or
- later), or the GNU General Public License, version 2 (GPLv2), in all
- cases as published by the Free Software Foundation.
-*/
-#ifndef __GANESHA_MEM_TYPES_H__
-#define __GANESHA_MEM_TYPES_H__
-
-
-#include "mem-types.h"
-
-enum gf_ganesha_mem_types_ {
- gf_ganesha_mt_priv_t = gf_common_mt_end + 1,
- gf_ganesha_mt_end
-};
-
-#endif
diff --git a/xlators/features/ganesha/src/ganesha.c b/xlators/features/ganesha/src/ganesha.c
deleted file mode 100644
index 8599154..0000000
--- a/xlators/features/ganesha/src/ganesha.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com>
- This file is part of GlusterFS.
-
- This file is licensed to you under your choice of the GNU Lesser
- General Public License, version 3 or any later version (LGPLv3 or
- later), or the GNU General Public License, version 2 (GPLv2), in all
- cases as published by the Free Software Foundation.
-*/
-
-
-#include "ganesha.h"
-#include "ganesha-mem-types.h"
-
-
-int32_t
-mem_acct_init (xlator_t *this)
-{
- int ret = -1;
-
- if (!this)
- return ret;
-
- ret = xlator_mem_acct_init (this, gf_ganesha_mt_end + 1);
-
- if (ret != 0)
- gf_log (this->name, GF_LOG_WARNING, "Memory accounting"
- "init failed");
-
- return ret;
-}
-
-int32_t
-init (xlator_t *this)
-{
- int ret = -1;
- ganesha_priv_t *priv = NULL;
-
- if (!this->children || this->children->next) {
- gf_log (this->name, GF_LOG_ERROR,
- "Need subvolume == 1");
- goto err;
- }
-
- if (!this->parents) {
- gf_log (this->name, GF_LOG_WARNING,
- "Dangling volume. Check volfile");
- goto err;
- }
-
- priv = GF_CALLOC (1, sizeof (*priv), gf_ganesha_mt_priv_t);
- if (!priv)
- goto err;
-
- this->private = priv;
- ret = 0;
-
-err:
- return ret;
-}
-
-
-void
-fini (xlator_t *this)
-{
- ganesha_priv_t *priv = this->private;
-
- this->private = NULL;
- if (priv)
- GF_FREE (priv);
-
- return;
-}
-
-struct xlator_fops fops = {
-};
-
-struct xlator_cbks cbks = {
-};
-
-struct volume_options options[] = {
-
- { .key = {"ganesha.enable"},
- .default_value = "off",
- .type = GF_OPTION_TYPE_BOOL,
- .description = "export volume via NFS-Ganesha"
- },
- { .key = {NULL}
- },
-};
diff --git a/xlators/features/ganesha/src/ganesha.h b/xlators/features/ganesha/src/ganesha.h
deleted file mode 100644
index 86320e9..0000000
--- a/xlators/features/ganesha/src/ganesha.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com>
- This file is part of GlusterFS.
-
- This file is licensed to you under your choice of the GNU Lesser
- General Public License, version 3 or any later version (LGPLv3 or
- later), or the GNU General Public License, version 2 (GPLv2), in all
- cases as published by the Free Software Foundation.
-*/
-
-#include "xlator.h"
-#include "ganesha-mem-types.h"
-
-typedef struct {
- char *host_name;
-} ganesha_priv_t;
-
-