diff options
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 75469d68e26..55c2bda1dd1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -1067,12 +1067,6 @@ glusterd_op_stage_set_volume (dict_t *dict, char **op_errstr) if (ret) goto out; - if ((strcmp (key, "ganesha.enable") == 0) && - (strcmp (value, "off") == 0)) { - ret = ganesha_manage_export (dict, "off", op_errstr); - if (ret) - goto out; - } ret = glusterd_check_quota_cmd (key, value, errstr, sizeof (errstr)); if (ret) goto out; @@ -1581,21 +1575,6 @@ glusterd_op_stage_reset_volume (dict_t *dict, char **op_errstr) goto out; } - /* * - * If key ganesha.enable is set, then volume should be unexported from - * ganesha server. Also it is a volume-level option, perform only when - * volume name not equal to "all"(in other words if volinfo != NULL) - */ - if (volinfo && (!strcmp (key, "all") || !strcmp(key, "ganesha.enable"))) { - if (glusterd_check_ganesha_export (volinfo)) { - ret = ganesha_manage_export (dict, "off", op_errstr); - if (ret) - gf_msg (this->name, GF_LOG_WARNING, 0, - GD_MSG_NFS_GNS_RESET_FAIL, - "Could not reset ganesha.enable key"); - } - } - if (strcmp(key, "all")) { exists = glusterd_check_option_exists (key, &key_fixed); if (exists == -1) { @@ -2318,16 +2297,6 @@ glusterd_op_reset_volume (dict_t *dict, char **op_rspstr) } } - if (!strcmp(key, "ganesha.enable") || !strcmp (key, "all")) { - if (glusterd_check_ganesha_export (volinfo)) { - ret = manage_export_config (volname, "off", op_rspstr); - if (ret) - gf_msg (this->name, GF_LOG_WARNING, 0, - GD_MSG_NFS_GNS_RESET_FAIL, - "Could not reset ganesha.enable key"); - } - } - out: GF_FREE (key_fixed); if (quorum_action) @@ -2890,9 +2859,6 @@ glusterd_op_set_volume (dict_t *dict, char **errstr) } } - ret = glusterd_check_ganesha_cmd (key, value, errstr, dict); - if (ret == -1) - goto out; if (!is_key_glusterd_hooks_friendly (key)) { ret = glusterd_check_option_exists (key, &key_fixed); GF_ASSERT (ret); @@ -4501,12 +4467,6 @@ glusterd_op_build_payload (dict_t **req, char **op_errstr, dict_t *op_ctx) } break; - case GD_OP_GANESHA: - { - dict_copy (dict, req_dict); - } - break; - default: break; } @@ -6001,10 +5961,6 @@ glusterd_op_stage_validate (glusterd_op_t op, dict_t *dict, char **op_errstr, ret = glusterd_op_stage_set_volume (dict, op_errstr); break; - case GD_OP_GANESHA: - ret = glusterd_op_stage_set_ganesha (dict, op_errstr); - break; - case GD_OP_RESET_VOLUME: ret = glusterd_op_stage_reset_volume (dict, op_errstr); break; @@ -6125,9 +6081,6 @@ glusterd_op_commit_perform (glusterd_op_t op, dict_t *dict, char **op_errstr, case GD_OP_SET_VOLUME: ret = glusterd_op_set_volume (dict, op_errstr); break; - case GD_OP_GANESHA: - ret = glusterd_op_set_ganesha (dict, op_errstr); - break; case GD_OP_RESET_VOLUME: ret = glusterd_op_reset_volume (dict, op_errstr); |