From 90d5d569b5a2333094ba8741bb29fe040b695b23 Mon Sep 17 00:00:00 2001
From: Kaushal M <kaushal@redhat.com>
Date: Tue, 24 Apr 2012 10:32:53 +0530
Subject: glusterd: glusterd_op_build_payload() fix for geo-rep

Change-Id: I9f625022fa6d70ccda70d197e4124fa73be8e776
BUG: 815603
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: http://review.gluster.com/3215
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kp@gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
---
 xlators/mgmt/glusterd/src/glusterd-op-sm.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 8f70472f50c..80976f2ca20 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -1873,16 +1873,12 @@ glusterd_op_build_payload (dict_t **req, char **op_errstr)
                                                                   &errstr,
                                                                   &volname,
                                                                   NULL);
-                                if (ret) {
-                                        gf_log (THIS->name, GF_LOG_ERROR,
-                                                "%s", errstr);
-                                        goto out;
+                                if (ret == 0) {
+                                        ret = glusterd_dict_set_volid
+                                                (dict, volname, op_errstr);
+                                        if (ret)
+                                                goto out;
                                 }
-
-                                ret = glusterd_dict_set_volid (dict, volname,
-                                                               op_errstr);
-                                if (ret)
-                                        goto out;
                                 dict_copy (dict, req_dict);
                         }
                         break;
-- 
cgit