diff options
| author | Jiffin Tony Thottan <jthottan@redhat.com> | 2017-02-22 18:26:30 +0530 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2017-05-01 21:44:09 +0000 |
| commit | 658d2b174a0f280d8ba2dde30cf9e4686312c430 (patch) | |
| tree | fbb47568ec1b213630f333f014c1a180d3a104f2 | |
| parent | 657a82ca1475a7325b90022957bb880429dcf939 (diff) | |
glusterd/ganesha : return proper value in pre_setup()
Change-Id: I6f7ce82488904c7d418ee078162f26f1ec81e9d9
BUG: 1426156
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Reviewed-on: https://review.gluster.org/16733
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
Tested-by: Raghavendra Talur <rtalur@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-ganesha.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c index 32388056314..6c1fa95dfa7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c +++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c @@ -834,15 +834,14 @@ pre_setup (gf_boolean_t run_setup, char **op_errstr) { int ret = 0; - ret = check_host_list(); - - if (ret) { + if (check_host_list()) { ret = setup_cluster(run_setup); if (ret == -1) gf_asprintf (op_errstr, "Failed to set up HA " "config for NFS-Ganesha. " "Please check the log file for details"); - } + } else + ret = -1; return ret; } |