persistent: reduce indentation for the finishing moves in ctdb_persistent_callback

(cherry picked from commit 2c2d1646eb753ea9561f085bcb101153267b052b)

Signed-off-by: Michael Adam <obnox@samba.org>

diff --git a/server/ctdb_persistent.c b/server/ctdb_persistent.c
index 3f3a6359d60180c581822a469d7eb6d9288f17a3..4dbcaccff4d585be423702a5a853ddaa3ec35785 100644 (file)
--- a/server/ctdb_persistent.c
+++ b/server/ctdb_persistent.c
@@ -52,6 +52,7 @@ static void ctdb_persistent_callback(struct ctdb_context *ctdb,
 {
        struct ctdb_persistent_state *state = talloc_get_type(private_data, 
                                                              struct ctdb_persistent_state);
+       enum ctdb_trans2_commit_error etype;
 
        if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL) {
                DEBUG(DEBUG_INFO, ("ctdb_persistent_callback: ignoring reply "
@@ -78,18 +79,21 @@ static void ctdb_persistent_callback(struct ctdb_context *ctdb,
        }
 
        state->num_pending--;
-       if (state->num_pending == 0) {
-               enum ctdb_trans2_commit_error etype;
-               if (state->num_failed == state->num_sent) {
-                       etype = CTDB_TRANS2_COMMIT_ALLFAIL;
-               } else if (state->num_failed != 0) {
-                       etype = CTDB_TRANS2_COMMIT_SOMEFAIL;
-               } else {
-                       etype = CTDB_TRANS2_COMMIT_SUCCESS;
-               }
-               ctdb_request_control_reply(state->ctdb, state->c, NULL, etype, state->errormsg);
-               talloc_free(state);
+
+       if (state->num_pending != 0) {
+               return;
        }
+
+       if (state->num_failed == state->num_sent) {
+               etype = CTDB_TRANS2_COMMIT_ALLFAIL;
+       } else if (state->num_failed != 0) {
+               etype = CTDB_TRANS2_COMMIT_SOMEFAIL;
+       } else {
+               etype = CTDB_TRANS2_COMMIT_SUCCESS;
+       }
+
+       ctdb_request_control_reply(state->ctdb, state->c, NULL, etype, state->errormsg);
+       talloc_free(state);
 }
 
 /*