diff options
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volume-ops.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index ad5fe909578..d7983f6fd71 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -1733,16 +1733,6 @@ glusterd_op_stage_stop_volume (dict_t *dict, char **op_errstr) ret = -1; goto out; } - ret = glusterd_check_ganesha_export (volinfo); - if (ret) { - ret = ganesha_manage_export(dict, "off", op_errstr); - if (ret) { - gf_msg (THIS->name, GF_LOG_WARNING, 0, - GD_MSG_NFS_GNS_UNEXPRT_VOL_FAIL, "Could not " - "unexport volume via NFS-Ganesha"); - ret = 0; - } - } if (glusterd_is_defrag_on (volinfo)) { snprintf (msg, sizeof(msg), "rebalance session is " @@ -2547,8 +2537,6 @@ glusterd_op_start_volume (dict_t *dict, char **op_errstr) char *brick_mount_dir = NULL; char key[PATH_MAX] = ""; char *volname = NULL; - char *str = NULL; - gf_boolean_t option = _gf_false; int flags = 0; glusterd_volinfo_t *volinfo = NULL; glusterd_brickinfo_t *brickinfo = NULL; @@ -2611,28 +2599,6 @@ glusterd_op_start_volume (dict_t *dict, char **op_errstr) } } - ret = dict_get_str (conf->opts, GLUSTERD_STORE_KEY_GANESHA_GLOBAL, &str); - if (ret != 0) { - gf_msg (this->name, GF_LOG_INFO, 0, - GD_MSG_DICT_GET_FAILED, "Global dict not present."); - ret = 0; - - } else { - ret = gf_string2boolean (str, &option); - /* Check if the feature is enabled and set nfs-disable to true */ - if (option) { - gf_msg_debug (this->name, 0, "NFS-Ganesha is enabled"); - /* Gluster-nfs should not start when NFS-Ganesha is enabled*/ - ret = dict_set_str (volinfo->dict, NFS_DISABLE_MAP_KEY, "on"); - if (ret) { - gf_msg (this->name, GF_LOG_ERROR, 0, - GD_MSG_DICT_SET_FAILED, "Failed to set nfs.disable for" - "volume %s", volname); - goto out; - } - } - } - ret = glusterd_start_volume (volinfo, flags, _gf_true); if (ret) goto out; |