From 2453fd874197f84e11ae70053cff7f56a32988f4 Mon Sep 17 00:00:00 2001
From: CoprDistGit <infra@openeuler.org>
Date: Thu, 1 Aug 2024 14:35:16 +0000
Subject: automatic import of glusterfs

---
 ...-ganesha-return-proper-value-in-pre_setup.patch | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 0064-glusterd-ganesha-return-proper-value-in-pre_setup.patch

(limited to '0064-glusterd-ganesha-return-proper-value-in-pre_setup.patch')

diff --git a/0064-glusterd-ganesha-return-proper-value-in-pre_setup.patch b/0064-glusterd-ganesha-return-proper-value-in-pre_setup.patch
new file mode 100644
index 0000000..042e1c0
--- /dev/null
+++ b/0064-glusterd-ganesha-return-proper-value-in-pre_setup.patch
@@ -0,0 +1,52 @@
+From 37bf4daca164cfcb260760ee2fd25d66f920dc7f Mon Sep 17 00:00:00 2001
+From: Jiffin Tony Thottan <jthottan@redhat.com>
+Date: Wed, 22 Feb 2017 18:26:30 +0530
+Subject: [PATCH 064/124] glusterd/ganesha : return proper value in pre_setup()
+
+Label: DOWNSTREAM ONLY
+
+Change-Id: I6f7ce82488904c7d418ee078162f26f1ec81e9d9
+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>
+Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
+Reviewed-on: https://code.engineering.redhat.com/gerrit/167149
+Reviewed-by: Soumya Koduri <skoduri@redhat.com>
+Tested-by: RHGS Build Bot <nigelb@redhat.com>
+Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
+---
+ xlators/mgmt/glusterd/src/glusterd-ganesha.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
+index 1c2ba7a..d9fdfc6 100644
+--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
++++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
+@@ -843,16 +843,15 @@ 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;
+ }
+-- 
+1.8.3.1
+
-- 
cgit v1.2.3