traverse: Use ctdb local variable for convenience
authorAmitay Isaacs <amitay@gmail.com>
Fri, 13 Sep 2013 03:28:31 +0000 (13:28 +1000)
committerAmitay Isaacs <amitay@gmail.com>
Wed, 25 Sep 2013 04:59:45 +0000 (14:59 +1000)
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
server/ctdb_traverse.c

index 83fd5dc1dfcb0c58f300f24129c2658ca7888a7c..f75227e67cac6a178819656491e62b28f3687a4d 100644 (file)
@@ -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);