4 files changed, 11 insertions, 7 deletions
diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c
index afb5880b459..8cccbc86f0f 100644
--- a/xlators/cluster/dht/src/dht-shared.c
+++ b/xlators/cluster/dht/src/dht-shared.c
@@ -41,8 +41,6 @@
    - handle all cases in self heal layout reconstruction
    - complete linkfile selfheal
 */
-/* FIXME: Not sure why someone defined this here */
-/* struct volume_options options[]; */
 
 extern dht_methods_t dht_methods;
 
@@ -908,7 +906,7 @@ err:
     return -1;
 }
 
-struct volume_options options[] = {
+struct volume_options dht_options[] = {
     {
         .key = {"lookup-unhashed"},
         .value = {"auto", "yes", "no", "enable", "disable", "1", "0", "on",
@@ -1202,3 +1200,8 @@ struct volume_options options[] = {
 
     {.key = {NULL}},
 };
+
+#define NUM_DHT_OPTIONS (sizeof(dht_options) / sizeof(dht_options[0]))
+
+extern struct volume_options options[NUM_DHT_OPTIONS]
+    __attribute__((alias("dht_options")));
diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c
index 6dfaa3b23ed..63ab926ca58 100644
--- a/xlators/cluster/dht/src/dht.c
+++ b/xlators/cluster/dht/src/dht.c
@@ -104,7 +104,8 @@ struct xlator_cbks cbks = {
 
 extern int32_t
 mem_acct_init(xlator_t *this);
-extern struct volume_options options[];
+
+extern struct volume_options dht_options[];
 
 xlator_api_t xlator_api = {
     .init = dht_init,
@@ -116,7 +117,7 @@ xlator_api_t xlator_api = {
     .dumpops = &dumpops,
     .fops = &fops,
     .cbks = &cbks,
-    .options = options,
+    .options = dht_options,
     .identifier = "distribute",
     .pass_through_fops = &dht_pt_fops,
     .category = GF_MAINTAINED,
diff --git a/xlators/cluster/dht/src/nufa.c b/xlators/cluster/dht/src/nufa.c
index b8077f972d1..558611384fe 100644
--- a/xlators/cluster/dht/src/nufa.c
+++ b/xlators/cluster/dht/src/nufa.c
@@ -12,7 +12,7 @@
 
 /* TODO: all 'TODO's in dht.c holds good */
 
-extern struct volume_options options[];
+extern struct volume_options dht_options[];
 
 int
 nufa_local_lookup_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
diff --git a/xlators/cluster/dht/src/switch.c b/xlators/cluster/dht/src/switch.c
index ca9bfce5a8e..a3c384b0f5c 100644
--- a/xlators/cluster/dht/src/switch.c
+++ b/xlators/cluster/dht/src/switch.c
@@ -16,7 +16,7 @@
 #include <fnmatch.h>
 #include <string.h>
 
-extern struct volume_options options[];
+extern struct volume_options dht_options[];
 
 struct switch_sched_array {
     xlator_t *xl;