mirror of
https://github.com/samba-team/samba.git
synced 2025-01-03 01:18:10 +03:00
ctdb: Make ctdb_lock_timeout_handler() easier to understand
Don't hide the real action inside an if-branch Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Noel Power <noel.power@suse.com>
This commit is contained in:
parent
f525800613
commit
2fa0eabe64
@ -557,6 +557,7 @@ static void ctdb_lock_timeout_handler(struct tevent_context *ev,
|
||||
bool skip;
|
||||
char *keystr;
|
||||
const char **args;
|
||||
bool ok;
|
||||
|
||||
lock_ctx = talloc_get_type_abort(private_data, struct lock_context);
|
||||
ctdb = lock_ctx->ctdb;
|
||||
@ -595,10 +596,17 @@ static void ctdb_lock_timeout_handler(struct tevent_context *ev,
|
||||
|
||||
lock_debug:
|
||||
|
||||
if (ctdb_set_helper("lock debugging helper",
|
||||
debug_locks, sizeof(debug_locks),
|
||||
ok = ctdb_set_helper("lock debugging helper",
|
||||
debug_locks,
|
||||
sizeof(debug_locks),
|
||||
"CTDB_DEBUG_LOCKS",
|
||||
getenv("CTDB_BASE"), "debug_locks.sh")) {
|
||||
getenv("CTDB_BASE"),
|
||||
"debug_locks.sh");
|
||||
if (!ok) {
|
||||
DBG_WARNING("Unable to setup lock debugging\n");
|
||||
goto skip_lock_debug;
|
||||
}
|
||||
|
||||
args = debug_locks_args(lock_ctx, lock_ctx);
|
||||
if (args != NULL) {
|
||||
pid = vfork();
|
||||
@ -611,11 +619,6 @@ lock_debug:
|
||||
} else {
|
||||
D_WARNING("No memory for debug locks args\n");
|
||||
}
|
||||
} else {
|
||||
DEBUG(DEBUG_WARNING,
|
||||
(__location__
|
||||
" Unable to setup lock debugging\n"));
|
||||
}
|
||||
|
||||
skip_lock_debug:
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user