17b94a
From 37bf4daca164cfcb260760ee2fd25d66f920dc7f Mon Sep 17 00:00:00 2001
17b94a
From: Jiffin Tony Thottan <jthottan@redhat.com>
17b94a
Date: Wed, 22 Feb 2017 18:26:30 +0530
17b94a
Subject: [PATCH 064/124] glusterd/ganesha : return proper value in pre_setup()
17b94a
17b94a
Label: DOWNSTREAM ONLY
17b94a
17b94a
Change-Id: I6f7ce82488904c7d418ee078162f26f1ec81e9d9
17b94a
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
17b94a
Reviewed-on: https://review.gluster.org/16733
17b94a
Smoke: Gluster Build System <jenkins@build.gluster.org>
17b94a
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
17b94a
Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
17b94a
Tested-by: Raghavendra Talur <rtalur@redhat.com>
17b94a
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
17b94a
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
17b94a
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
17b94a
Reviewed-on: https://code.engineering.redhat.com/gerrit/167149
17b94a
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
17b94a
Tested-by: RHGS Build Bot <nigelb@redhat.com>
17b94a
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
17b94a
---
17b94a
 xlators/mgmt/glusterd/src/glusterd-ganesha.c | 7 +++----
17b94a
 1 file changed, 3 insertions(+), 4 deletions(-)
17b94a
17b94a
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
17b94a
index 1c2ba7a..d9fdfc6 100644
17b94a
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
17b94a
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
17b94a
@@ -843,16 +843,15 @@ pre_setup(gf_boolean_t run_setup, char **op_errstr)
17b94a
 {
17b94a
     int ret = 0;
17b94a
 
17b94a
-    ret = check_host_list();
17b94a
-
17b94a
-    if (ret) {
17b94a
+    if (check_host_list()) {
17b94a
         ret = setup_cluster(run_setup);
17b94a
         if (ret == -1)
17b94a
             gf_asprintf(op_errstr,
17b94a
                         "Failed to set up HA "
17b94a
                         "config for NFS-Ganesha. "
17b94a
                         "Please check the log file for details");
17b94a
-    }
17b94a
+    } else
17b94a
+        ret = -1;
17b94a
 
17b94a
     return ret;
17b94a
 }
17b94a
-- 
17b94a
1.8.3.1
17b94a