[PATCH] ctdb-server: Remove one-line goto

Swen Schillig swen at vnet.ibm.com
Fri Mar 9 08:15:38 UTC 2018


Please review and push if OK.

Thanks in advance.

Cheers Swen
-------------- next part --------------
From 1258c948b91a9cb3187ca7f14f0e681f5eb55412 Mon Sep 17 00:00:00 2001
From: Swen Schillig <swen at vnet.ibm.com>
Date: Mon, 5 Mar 2018 09:58:45 +0100
Subject: [PATCH] ctdb-server: Remove one-line goto

Replaced a on-line jump goto by the more natural else-clause.

Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
---
 ctdb/server/ctdb_call.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
index a076000a800..84df067095c 100644
--- a/ctdb/server/ctdb_call.c
+++ b/ctdb/server/ctdb_call.c
@@ -1881,13 +1881,10 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb,
 			D_ERR("Failed to switch from server to client "
 			      "for revokechild process\n");
 			c = 1;
-			goto child_finished;
+		} else {
+			c = ctdb_revoke_all_delegations(ctdb, ctdb_db, tdata,
+							key, header, data);
 		}
-
-		c = ctdb_revoke_all_delegations(ctdb, ctdb_db, tdata, key,
-						header, data);
-
-child_finished:
 		sys_write(rev_hdl->fd[1], &c, 1);
 		ctdb_wait_for_process_to_exit(parent);
 		_exit(0);
-- 
2.14.3



More information about the samba-technical mailing list