diff options
author | Amar Tumballi <amarts@redhat.com> | 2018-12-06 16:24:52 +0530 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2018-12-13 14:41:50 +0530 |
commit | af7e957b4954bd84b8f7df6bfbd59c939092ead2 (patch) | |
tree | adee47b6e02a44f5ba3f722d767dca929ccbd9c1 /xlators/cluster | |
parent | 088e2cbb5ee3f3e766b7e4021e2d86d0c5187de0 (diff) |
xlator: make 'xlator_api' mandatory
* Remove the options to load old symbol.
* keep only 'xlator_api' symbol from being exported using xlator.sym
* add xlator_api to all the xlators where its missing
NOTE: This covers all the xlators which has at least a test case
to validate its loading. If there is a translator, which doesn't
have any test, then we should probably remove that from codebase.
fixes: #164
Change-Id: Ibcdc8c9844cda6b4463d907a15813745d14c1ebb
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'xlators/cluster')
-rw-r--r-- | xlators/cluster/dht/src/Makefile.am | 14 | ||||
-rw-r--r-- | xlators/cluster/dht/src/dht.sym | 9 | ||||
-rw-r--r-- | xlators/cluster/dht/src/nufa.c | 21 | ||||
-rw-r--r-- | xlators/cluster/dht/src/nufa.sym | 8 | ||||
-rw-r--r-- | xlators/cluster/dht/src/switch.c | 21 | ||||
-rw-r--r-- | xlators/cluster/dht/src/switch.sym | 8 | ||||
-rw-r--r-- | xlators/cluster/ec/src/ec.c | 20 |
7 files changed, 54 insertions, 47 deletions
diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am index caeb17b0f07..56f1f2ad7c8 100644 --- a/xlators/cluster/dht/src/Makefile.am +++ b/xlators/cluster/dht/src/Makefile.am @@ -14,19 +14,13 @@ dht_la_SOURCES = $(dht_common_source) dht.c nufa_la_SOURCES = $(dht_common_source) nufa.c switch_la_SOURCES = $(dht_common_source) switch.c -dht_la_LDFLAGS = -module \ - -export-symbols $(top_srcdir)/xlators/cluster/dht/src/dht.sym \ - $(GF_XLATOR_LDFLAGS) +dht_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -nufa_la_LDFLAGS = -module \ - -export-symbols $(top_srcdir)/xlators/cluster/dht/src/nufa.sym \ - $(GF_XLATOR_LDFLAGS) +nufa_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -switch_la_LDFLAGS = -module \ - -export-symbols $(top_srcdir)/xlators/cluster/dht/src/switch.sym \ - $(GF_XLATOR_LDFLAGS) +switch_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = dht-common.h dht-mem-types.h dht-messages.h \ @@ -41,8 +35,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ CLEANFILES = -EXTRA_DIST = dht.sym nufa.sym switch.sym - uninstall-local: rm -f $(DESTDIR)$(xlatordir)/distribute.so diff --git a/xlators/cluster/dht/src/dht.sym b/xlators/cluster/dht/src/dht.sym deleted file mode 100644 index 24241a91baf..00000000000 --- a/xlators/cluster/dht/src/dht.sym +++ /dev/null @@ -1,9 +0,0 @@ -xlator_api -fops -cbks -class_methods -dht_methods -options -mem_acct_init -reconfigure -dumpops diff --git a/xlators/cluster/dht/src/nufa.c b/xlators/cluster/dht/src/nufa.c index 558611384fe..59313639c45 100644 --- a/xlators/cluster/dht/src/nufa.c +++ b/xlators/cluster/dht/src/nufa.c @@ -599,11 +599,6 @@ dht_methods_t dht_methods = { .layout_search = dht_layout_search, }; -class_methods_t class_methods = {.init = nufa_init, - .fini = dht_fini, - .reconfigure = dht_reconfigure, - .notify = dht_notify}; - struct xlator_fops fops = { .lookup = nufa_lookup, .create = nufa_create, @@ -645,3 +640,19 @@ struct xlator_fops fops = { }; struct xlator_cbks cbks = {.forget = dht_forget}; +extern int32_t +mem_acct_init(xlator_t *this); + +xlator_api_t xlator_api = { + .init = nufa_init, + .fini = dht_fini, + .notify = dht_notify, + .reconfigure = dht_reconfigure, + .mem_acct_init = mem_acct_init, + .op_version = {1}, /* Present from the initial version */ + .fops = &fops, + .cbks = &cbks, + .options = dht_options, + .identifier = "nufa", + .category = GF_TECH_PREVIEW, +}; diff --git a/xlators/cluster/dht/src/nufa.sym b/xlators/cluster/dht/src/nufa.sym deleted file mode 100644 index 780b5fc0387..00000000000 --- a/xlators/cluster/dht/src/nufa.sym +++ /dev/null @@ -1,8 +0,0 @@ -fops -cbks -class_methods -dht_methods -options -mem_acct_init -reconfigure -dumpops diff --git a/xlators/cluster/dht/src/switch.c b/xlators/cluster/dht/src/switch.c index a3c384b0f5c..a782fcdfbd2 100644 --- a/xlators/cluster/dht/src/switch.c +++ b/xlators/cluster/dht/src/switch.c @@ -823,11 +823,6 @@ err: return -1; } -class_methods_t class_methods = {.init = switch_init, - .fini = switch_fini, - .reconfigure = dht_reconfigure, - .notify = dht_notify}; - struct xlator_fops fops = { .lookup = switch_lookup, .create = switch_create, @@ -869,3 +864,19 @@ struct xlator_fops fops = { }; struct xlator_cbks cbks = {.forget = dht_forget}; +extern int32_t +mem_acct_init(xlator_t *this); + +xlator_api_t xlator_api = { + .init = switch_init, + .fini = switch_fini, + .notify = dht_notify, + .reconfigure = dht_reconfigure, + .mem_acct_init = mem_acct_init, + .op_version = {1}, /* Present from the initial version */ + .fops = &fops, + .cbks = &cbks, + .options = dht_options, + .identifier = "switch", + .category = GF_TECH_PREVIEW, +}; diff --git a/xlators/cluster/dht/src/switch.sym b/xlators/cluster/dht/src/switch.sym deleted file mode 100644 index 780b5fc0387..00000000000 --- a/xlators/cluster/dht/src/switch.sym +++ /dev/null @@ -1,8 +0,0 @@ -fops -cbks -class_methods -dht_methods -options -mem_acct_init -reconfigure -dumpops diff --git a/xlators/cluster/ec/src/ec.c b/xlators/cluster/ec/src/ec.c index d6336953343..13ffeb96012 100644 --- a/xlators/cluster/ec/src/ec.c +++ b/xlators/cluster/ec/src/ec.c @@ -1666,4 +1666,22 @@ struct volume_options options[] = { "specially for sequential writes. However, this will also" "lead to extra memory consumption, maximum " "(cache size * stripe size) Bytes per open file."}, - {.key = {NULL}}}; + { + .key = {NULL}, + }, +}; + +xlator_api_t xlator_api = { + .init = init, + .fini = fini, + .notify = notify, + .reconfigure = reconfigure, + .mem_acct_init = mem_acct_init, + .op_version = {1}, + .dumpops = &dumpops, + .fops = &fops, + .cbks = &cbks, + .options = options, + .identifier = "disperse", + .category = GF_MAINTAINED, +}; |