1 files changed, 28 insertions, 6 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.h b/xlators/mgmt/glusterd/src/glusterd-volgen.h
index f9fc068931b..cd4d0c7d0cc 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.h
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.h
@@ -38,6 +38,9 @@
 #define VKEY_RDA_CACHE_LIMIT "performance.rda-cache-limit"
 #define VKEY_RDA_REQUEST_SIZE "performance.rda-request-size"
 #define VKEY_CONFIG_GFPROXY "config.gfproxyd"
+#define VKEY_CONFIG_GLOBAL_THREADING "config.global-threading"
+#define VKEY_CONFIG_CLIENT_THREADS "config.client-threads"
+#define VKEY_CONFIG_BRICK_THREADS "config.brick-threads"
 
 #define AUTH_ALLOW_MAP_KEY "auth.allow"
 #define AUTH_REJECT_MAP_KEY "auth.reject"
@@ -66,6 +69,7 @@ typedef enum {
     GF_REBALANCED = 1,
     GF_QUOTAD,
     GF_SNAPD,
+    GF_SHD,
 } glusterd_graph_type_t;
 
 struct volgen_graph {
@@ -77,6 +81,8 @@ typedef struct volgen_graph volgen_graph_t;
 
 typedef int (*glusterd_graph_builder_t)(volgen_graph_t *graph,
                                         dict_t *mod_dict);
+typedef int (*glusterd_vol_graph_builder_t)(glusterd_volinfo_t *,
+                                            char *filename, dict_t *mod_dict);
 
 #define COMPLETE_OPTION(key, completion, ret)                                  \
     do {                                                                       \
@@ -168,6 +174,12 @@ struct volgen_brick_xlator {
      * delay-gen before this xlator */
     char *dbg_key;
 };
+
+struct nfs_opt {
+    const char *pattern;
+    const char *printf_pattern;
+};
+
 typedef struct volgen_brick_xlator volgen_brick_xlator_t;
 
 int
@@ -201,11 +213,13 @@ void
 glusterd_get_shd_filepath(char *filename);
 
 int
-build_shd_graph(volgen_graph_t *graph, dict_t *mod_dict);
+build_shd_graph(glusterd_volinfo_t *volinfo, volgen_graph_t *graph,
+                dict_t *mod_dict);
 
+#ifdef BUILD_GNFS
 int
 build_nfs_graph(volgen_graph_t *graph, dict_t *mod_dict);
-
+#endif
 int
 build_quotad_graph(volgen_graph_t *graph, dict_t *mod_dict);
 
@@ -284,17 +298,20 @@ end_sethelp_xml_doc(xmlTextWriterPtr writer);
 char *
 glusterd_get_trans_type_rb(gf_transport_type ttype);
 
+struct volopt_map_entry *
+gd_get_vmep(const char *key);
+
 uint32_t
-glusterd_get_op_version_for_key(char *key);
+glusterd_get_op_version_from_vmep(struct volopt_map_entry *vmep);
 
 gf_boolean_t
-gd_is_client_option(char *key);
+gd_is_client_option(struct volopt_map_entry *vmep);
 
 gf_boolean_t
-gd_is_xlator_option(char *key);
+gd_is_xlator_option(struct volopt_map_entry *vmep);
 
 gf_boolean_t
-gd_is_boolean_option(char *key);
+gd_is_boolean_option(struct volopt_map_entry *vmep);
 
 char *
 volgen_get_shd_key(int type);
@@ -313,4 +330,9 @@ glusterd_generate_gfproxyd_volfile(glusterd_volinfo_t *volinfo);
 
 int
 glusterd_build_gfproxyd_volfile(glusterd_volinfo_t *volinfo, char *filename);
+
+int
+glusterd_shdsvc_generate_volfile(glusterd_volinfo_t *volinfo, char *filename,
+                                 dict_t *mode_dict);
+
 #endif