1 files changed, 4 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c
index 79b45a2b81a..59df582db77 100644
--- a/xlators/mgmt/glusterd/src/glusterd-syncop.c
+++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c
@@ -843,9 +843,7 @@ commit_done:
                         gf_asprintf (op_errstr, OPERRSTR_COMMIT_FAIL,
                                      hostname);
                 goto out;
-         } else {
-                 glusterd_op_modify_op_ctx (op, op_ctx);
-         }
+        }
 
         if (!npeers) {
                 ret = 0;
@@ -866,6 +864,9 @@ commit_done:
                 *op_errstr = gf_strdup (errstr);
 
 out:
+        if (!ret)
+                glusterd_op_modify_op_ctx (op, op_ctx);
+
         if (rsp_dict)
                 dict_unref (rsp_dict);
         return ret;