diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2013-09-13 13:28:31 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-09-25 14:59:45 +1000 |
| commit | 1740cbb58c0d3af97d3d037db2f63afbce62e1fb (patch) | |
| tree | 1b1e7005c2964911823b4006798d3dc1e0707cc1 | |
| parent | c4f49a53426265594206b1c88ccab32bbffcef80 (diff) | |
traverse: Use ctdb local variable for convenience
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit 25e9cf86328252f96215b54b94551dd7bbdd2db4)
| -rw-r--r-- | ctdb/server/ctdb_traverse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_traverse.c b/ctdb/server/ctdb_traverse.c index 83fd5dc1df..f75227e67c 100644 --- a/ctdb/server/ctdb_traverse.c +++ b/ctdb/server/ctdb_traverse.c @@ -197,12 +197,12 @@ static struct ctdb_traverse_local_handle *ctdb_traverse_local(struct ctdb_db_con /* start the traverse in the child */ int res; pid_t parent = getpid(); + struct ctdb_context *ctdb = ctdb_db->ctdb; close(h->fd[0]); ctdb_set_process_name("ctdb_traverse"); - if (switch_from_server_to_client(ctdb_db->ctdb, - "traverse_local-%s:", + if (switch_from_server_to_client(ctdb, "traverse_local-%s:", ctdb_db->db_name) != 0) { DEBUG(DEBUG_CRIT, ("Failed to switch traverse child into client mode\n")); _exit(0); @@ -217,7 +217,7 @@ static struct ctdb_traverse_local_handle *ctdb_traverse_local(struct ctdb_db_con } write(h->fd[1], &res, sizeof(res)); - while (ctdb_kill(ctdb_db->ctdb, parent, 0) == 0 || errno != ESRCH) { + while (ctdb_kill(ctdb, parent, 0) == 0 || errno != ESRCH) { sleep(5); } _exit(0); |