The branch, master has been updated via d964700a19b ctdb:utils: Fix code spelling via 8ccd915587f ctdb:utils: Remove trailing whitespaces in scsi_io.c via 88ee870e67d ctdb:tool: Fix code spelling via 9a37aa39697 ctdb:tests: Fix code spelling via 7aeed61dc5f ctdb:tcp: Fix code spelling via 7749df49924 ctdb:server: Fix code spelling via 19f418b68fe ctdb:server: Remove trailing whitespaces in ctdb_server.c via 59af5049997 ctdb:server: Remove trailing whitespaces in ctdb_recover.c via 200bc1f9374 ctdb:include: Fix code spelling via 44bde7a7880 ctdb:include: Remove trailing whitespaces in ctdb_protocol.h via 2e10481dacf ctdb:common: Fix code spelling via 6d7d82938b6 ctdb:client: Fix code spelling from e7ef43cead4 s4:dsdb/extended_dn_out: hide backlinks with DSDB_RMD_FLAG_HIDDEN_BL by default
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d964700a19b7fa032ead7f64c7c5bb3cd2532500 Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:45:26 2023 +0100 ctdb:utils: Fix code spelling Best reviewed with: `git show --word-diff` Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Fri Mar 24 07:57:37 UTC 2023 on atb-devel-224 commit 8ccd915587f40febed56445bc37ca4185d254bcc Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:45:04 2023 +0100 ctdb:utils: Remove trailing whitespaces in scsi_io.c Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> commit 88ee870e67daea1ea54503c3eaf819c87c2da2ff Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:42:43 2023 +0100 ctdb:tool: Fix code spelling Best reviewed with: `git show --word-diff` Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> commit 9a37aa39697494692e0a4a13fb8723b1d15c9599 Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:42:10 2023 +0100 ctdb:tests: Fix code spelling Best reviewed with: `git show --word-diff` Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> commit 7aeed61dc5fa7c3c3f762c18ad56d96de8d3fd1b Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:40:05 2023 +0100 ctdb:tcp: Fix code spelling Best reviewed with: `git show --word-diff` Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> commit 7749df49924ef30108880580b271657b923639d3 Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:36:23 2023 +0100 ctdb:server: Fix code spelling Best reviewed with: `git show --word-diff` Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> commit 19f418b68feee62d50ce092af848c9dd474b60b3 Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:35:55 2023 +0100 ctdb:server: Remove trailing whitespaces in ctdb_server.c Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> commit 59af5049997aa793ab3ea97e6a410da5d5367feb Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:33:04 2023 +0100 ctdb:server: Remove trailing whitespaces in ctdb_recover.c Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> commit 200bc1f9374c5dd21bc6bd33d3aa7c7d8d77b70f Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:29:34 2023 +0100 ctdb:include: Fix code spelling Best reviewed with: `git show --word-diff` Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> commit 44bde7a78809cc872e7e35b81f9b15b680537052 Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:30:31 2023 +0100 ctdb:include: Remove trailing whitespaces in ctdb_protocol.h Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> commit 2e10481dacf5a6e79622416ec5d78b9d2f5a957f Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:24:04 2023 +0100 ctdb:common: Fix code spelling Best reviewed with: `git show --word-diff` Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> commit 6d7d82938b6134ca4bae45614efd409271535b5a Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 22 09:22:37 2023 +0100 ctdb:client: Fix code spelling Best reviewed with: `git show --word-diff` Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Martin Schwenke <mschwe...@ddn.com> ----------------------------------------------------------------------- Summary of changes: ctdb/client/client.h | 4 +- ctdb/common/cmdline.h | 4 +- ctdb/common/conf.c | 2 +- ctdb/common/conf.h | 2 +- ctdb/common/ctdb_ltdb.c | 2 +- ctdb/common/rb_tree.c | 2 +- ctdb/common/rb_tree.h | 2 +- ctdb/common/reqid.h | 2 +- ctdb/common/sock_client.h | 2 +- ctdb/common/sock_daemon.h | 2 +- ctdb/common/tmon.h | 2 +- ctdb/include/ctdb_protocol.h | 6 +- ctdb/server/ctdb_call.c | 2 +- ctdb/server/ctdb_daemon.c | 74 +++++++++++----------- ctdb/server/ctdb_ltdb_server.c | 4 +- ctdb/server/ctdb_recover.c | 38 +++++------ ctdb/server/ctdb_recoverd.c | 4 +- ctdb/server/ctdb_recovery_helper.c | 4 +- ctdb/server/ctdb_server.c | 36 +++++------ ctdb/server/ctdb_takeover.c | 6 +- ctdb/server/ctdb_vacuum.c | 6 +- ctdb/server/ipalloc_common.c | 2 +- ctdb/server/ipalloc_lcp2.c | 8 +-- ctdb/server/ipalloc_nondeterministic.c | 4 +- ctdb/tcp/tcp_connect.c | 2 +- ctdb/tests/CLUSTER/complex/32_cifs_tickle.sh | 2 +- .../INTEGRATION/database/recovery.011.continue.sh | 2 +- .../simple/cluster.015.reclock_remove_lock.sh | 2 +- ctdb/tests/README | 2 +- ctdb/tests/UNIT/cunit/cluster_mutex_002.sh | 2 +- ctdb/tests/UNIT/eventscripts/stubs/rpcinfo | 2 +- ctdb/tests/UNIT/eventscripts/stubs/testparm | 2 +- ctdb/tests/local_daemons.sh | 2 +- ctdb/tests/src/ctdb_io_test.c | 2 +- ctdb/tests/src/db_test_tool.c | 2 +- ctdb/tests/src/event_script_test.c | 2 +- ctdb/tests/src/fake_ctdbd.c | 2 +- ctdb/tests/src/rb_test.c | 12 ++-- ctdb/tests/src/test_mutex_raw.c | 2 +- ctdb/tests/src/tmon_ping_test.c | 2 +- ctdb/tests/src/tmon_test.c | 2 +- ctdb/tools/ctdb.c | 6 +- ctdb/utils/scsi_io/scsi_io.c | 26 ++++---- ctdb/utils/tdb/tdb_mutex_check.c | 2 +- 44 files changed, 149 insertions(+), 149 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/client/client.h b/ctdb/client/client.h index 5f174035e28..9d1fd48142b 100644 --- a/ctdb/client/client.h +++ b/ctdb/client/client.h @@ -128,7 +128,7 @@ bool ctdb_client_init_recv(struct tevent_req *req, int *perr, * @param[in] ev Tevent context * @param[in] sockpath Path to ctdb daemon unix domain socket * @param[out] result The new ctdb client context - * @return 0 on succcess, errno on failure + * @return 0 on success, errno on failure */ int ctdb_client_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev, const char *sockpath, @@ -1177,7 +1177,7 @@ bool ctdb_g_lock_unlock_recv(struct tevent_req *req, int *perr); * * Starting a transaction will return a transaction handle. This is used * for updating records under a transaction. This handle is automatically - * freed once the transacion is committed or cancelled. + * freed once the transaction is committed or cancelled. * * Clients should NOT free the transaction handle. * diff --git a/ctdb/common/cmdline.h b/ctdb/common/cmdline.h index b9a128c2cc4..51519ca142b 100644 --- a/ctdb/common/cmdline.h +++ b/ctdb/common/cmdline.h @@ -63,7 +63,7 @@ struct cmdline_command { }; /** - * @brief convinience macro to define the end of commands list + * @brief convenience macro to define the end of commands list * * Here is an example of defining commands list. * @@ -135,7 +135,7 @@ int cmdline_parse(struct cmdline_context *cmdline, bool parse_options); /** - * @brief Excecute the function for the command matched by @cmdline_parse + * @brief Execute the function for the command matched by @cmdline_parse * * @param[in] cmdline Cmdline context * @param[in] private_data Private data for implementation function diff --git a/ctdb/common/conf.c b/ctdb/common/conf.c index e849ff4322f..a8ff724e73f 100644 --- a/ctdb/common/conf.c +++ b/ctdb/common/conf.c @@ -468,7 +468,7 @@ static int conf_option_new_value(struct conf_option *opt, /* * This happens only during load/reload. Set the value to * default value, so if the config option is dropped from - * config file, then it get's reset to default. + * config file, then it gets reset to default. */ opt->new_value = &opt->default_value; } else { diff --git a/ctdb/common/conf.h b/ctdb/common/conf.h index 6b152c1c358..4dbf9c33723 100644 --- a/ctdb/common/conf.h +++ b/ctdb/common/conf.h @@ -312,7 +312,7 @@ int conf_load(struct conf_context *conf, * @brief Reload the values for configuration options * * This function will re-load the values of the configuration options. This - * function can be called only after succesful call to conf_load(). + * function can be called only after successful call to conf_load(). * * @see conf_load * diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c index 0b79ab44281..97db5cc64de 100644 --- a/ctdb/common/ctdb_ltdb.c +++ b/ctdb/common/ctdb_ltdb.c @@ -35,7 +35,7 @@ /* - * Calculate tdb flags based on databse type + * Calculate tdb flags based on database type */ int ctdb_db_tdb_flags(uint8_t db_flags, bool with_valgrind, bool with_mutex) { diff --git a/ctdb/common/rb_tree.c b/ctdb/common/rb_tree.c index 0965623be77..8e13dff969e 100644 --- a/ctdb/common/rb_tree.c +++ b/ctdb/common/rb_tree.c @@ -463,7 +463,7 @@ delete_node(trbt_node_t *node, bool from_destructor) predecessor instead. The predecessor is guaranteed to have at most one child node since its right arm must be NULL - (It must be NULL since we are its sucessor and we are above + (It must be NULL since we are its successor and we are above it in the tree) */ if (node->left != NULL && node->right != NULL) { diff --git a/ctdb/common/rb_tree.h b/ctdb/common/rb_tree.h index b5ddbb2a2b2..59e7ccc4807 100644 --- a/ctdb/common/rb_tree.h +++ b/ctdb/common/rb_tree.h @@ -60,7 +60,7 @@ void *trbt_insert32(trbt_tree_t *tree, uint32_t key, void *data); tree. If a node already exists for this key then: callback is called with data==existing data and param=param - the returned calue is talloc_stolen and inserted in the tree + the returned value is talloc_stolen and inserted in the tree */ void trbt_insert32_callback(trbt_tree_t *tree, uint32_t key, void *(*callback)(void *param, void *data), void *param); diff --git a/ctdb/common/reqid.h b/ctdb/common/reqid.h index 736e5b38901..d6d393657f6 100644 --- a/ctdb/common/reqid.h +++ b/ctdb/common/reqid.h @@ -27,7 +27,7 @@ * * @brief Request id database * - * CTDB tracks messsages using request id. CTDB stores client state for each + * CTDB tracks messages using request id. CTDB stores client state for each * request id to process the replies correctly. */ diff --git a/ctdb/common/sock_client.h b/ctdb/common/sock_client.h index d661c85f3e1..49a0a52caee 100644 --- a/ctdb/common/sock_client.h +++ b/ctdb/common/sock_client.h @@ -105,7 +105,7 @@ void sock_client_set_disconnect_callback(struct sock_client_context *sockc, * @param[in] ev Tevent context * @param[in] sockc The socket client context * @param[in] timeout How long to wait for - * @param[in] request Requeset packet to be sent + * @param[in] request Request packet to be sent * @return new tevent request, or NULL on failure */ struct tevent_req *sock_client_msg_send(TALLOC_CTX *mem_ctx, diff --git a/ctdb/common/sock_daemon.h b/ctdb/common/sock_daemon.h index 7653d2c1023..85ed9613619 100644 --- a/ctdb/common/sock_daemon.h +++ b/ctdb/common/sock_daemon.h @@ -141,7 +141,7 @@ struct sock_daemon_funcs { * @param[in] buf Data received from the client * @param[in] buflen Length of the data * @param[i] private_data Private data associatedwith the socket - * @return new tevent reques, or NULL on failure + * @return new tevent request, or NULL on failure * * * read_recv() ends the async computation to process data on the socket diff --git a/ctdb/common/tmon.h b/ctdb/common/tmon.h index 1d315a9bcb0..7cbfbbd9fc0 100644 --- a/ctdb/common/tmon.h +++ b/ctdb/common/tmon.h @@ -192,7 +192,7 @@ bool tmon_parse_custom(struct tmon_pkt *pkt, uint16_t *val); * * @param[in] req Tevent request created by tmon_send * @param[in] pkt Packet to write - * @return true on sucess, false on failure + * @return true on success, false on failure */ bool tmon_write(struct tevent_req *req, struct tmon_pkt *pkt); diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index 7b6014fdff9..31af4201040 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -143,7 +143,7 @@ struct ctdb_req_tunnel_old { }; /* - Structure used for a nodemap. + Structure used for a nodemap. The nodemap is the structure containing a list of all nodes known to the cluster and their associated flags. */ @@ -202,7 +202,7 @@ struct ctdb_db_statistics_old { char hot_keys_wire[1]; }; -/* +/* a wire representation of the vnn map */ struct ctdb_vnn_map_wire { @@ -233,7 +233,7 @@ struct ctdb_tickle_list_old { /* struct holding a ctdb_sock_addr and an interface name, - used to add/remove public addresses and grat arp + used to add/remove public addresses and gratuitous arp */ struct ctdb_addr_info_old { ctdb_sock_addr addr; diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index 1d5dea32962..cef271958c5 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -189,7 +189,7 @@ static void ctdb_send_dmaster_reply(struct ctdb_db_context *ctdb_db, } if (ctdb->methods == NULL) { - ctdb_fatal(ctdb, "ctdb_send_dmaster_reply cant update dmaster since transport is down"); + ctdb_fatal(ctdb, "ctdb_send_dmaster_reply can't update dmaster since transport is down"); return; } diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index edd7d57532b..da60144bf2e 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -1,4 +1,4 @@ -/* +/* ctdb daemon code Copyright (C) Andrew Tridgell 2006 @@ -7,12 +7,12 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>. */ @@ -294,7 +294,7 @@ static void daemon_message_handler(uint64_t srvid, TDB_DATA data, } /* - this is called when the ctdb daemon received a ctdb request to + this is called when the ctdb daemon received a ctdb request to set the srvid from the client */ int daemon_register_message_handler(struct ctdb_context *ctdb, uint32_t client_id, uint64_t srvid) @@ -308,10 +308,10 @@ int daemon_register_message_handler(struct ctdb_context *ctdb, uint32_t client_i res = srvid_register(ctdb->srv, client, srvid, daemon_message_handler, client); if (res != 0) { - DEBUG(DEBUG_ERR,(__location__ " Failed to register handler %llu in daemon\n", + DEBUG(DEBUG_ERR,(__location__ " Failed to register handler %llu in daemon\n", (unsigned long long)srvid)); } else { - DEBUG(DEBUG_INFO,(__location__ " Registered message handler for srvid=%llu\n", + DEBUG(DEBUG_INFO,(__location__ " Registered message handler for srvid=%llu\n", (unsigned long long)srvid)); } @@ -319,7 +319,7 @@ int daemon_register_message_handler(struct ctdb_context *ctdb, uint32_t client_i } /* - this is called when the ctdb daemon received a ctdb request to + this is called when the ctdb daemon received a ctdb request to remove a srvid from the client */ int daemon_deregister_message_handler(struct ctdb_context *ctdb, uint32_t client_id, uint64_t srvid) @@ -399,7 +399,7 @@ static int ctdb_client_destructor(struct ctdb_client *client) this is called when the ctdb daemon received a ctdb request message from a local client over the unix domain socket */ -static void daemon_request_message_from_client(struct ctdb_client *client, +static void daemon_request_message_from_client(struct ctdb_client *client, struct ctdb_req_message_old *c) { TDB_DATA data; @@ -438,12 +438,12 @@ struct daemon_call_state { uint32_t client_callid; }; -/* - complete a call from a client +/* + complete a call from a client */ static void daemon_call_from_client_callback(struct ctdb_call_state *state) { - struct daemon_call_state *dstate = talloc_get_type(state->async.private_data, + struct daemon_call_state *dstate = talloc_get_type(state->async.private_data, struct daemon_call_state); struct ctdb_reply_call_old *r; int res; @@ -464,7 +464,7 @@ static void daemon_call_from_client_callback(struct ctdb_call_state *state) } length = offsetof(struct ctdb_reply_call_old, data) + dstate->call->reply_data.dsize; - /* If the client asked for readonly FETCH, we remapped this to + /* If the client asked for readonly FETCH, we remapped this to FETCH_WITH_HEADER when calling the daemon. So we must strip the extra header off the reply data before passing it back to the client. @@ -474,7 +474,7 @@ static void daemon_call_from_client_callback(struct ctdb_call_state *state) length -= sizeof(struct ctdb_ltdb_header); } - r = ctdbd_allocate_pkt(client->ctdb, dstate, CTDB_REPLY_CALL, + r = ctdbd_allocate_pkt(client->ctdb, dstate, CTDB_REPLY_CALL, length, struct ctdb_reply_call_old); if (r == NULL) { DEBUG(DEBUG_ERR, (__location__ " Failed to allocate reply_call in ctdb daemon\n")); @@ -521,7 +521,7 @@ struct ctdb_daemon_packet_wrap { static void daemon_incoming_packet_wrap(void *p, struct ctdb_req_header *hdr) { struct ctdb_client *client; - struct ctdb_daemon_packet_wrap *w = talloc_get_type(p, + struct ctdb_daemon_packet_wrap *w = talloc_get_type(p, struct ctdb_daemon_packet_wrap); if (w == NULL) { DEBUG(DEBUG_CRIT,(__location__ " Bad packet type '%s'\n", talloc_get_name(p))); @@ -538,7 +538,7 @@ static void daemon_incoming_packet_wrap(void *p, struct ctdb_req_header *hdr) talloc_free(w); /* process it */ - daemon_incoming_packet(client, hdr); + daemon_incoming_packet(client, hdr); } struct ctdb_deferred_fetch_call { @@ -640,7 +640,7 @@ static void dfq_timeout(struct tevent_context *ev, struct tevent_timer *te, /* This function is used in the local daemon to register a KEY in a database for being "fetched" - While the remote fetch is in-flight, any futher attempts to re-fetch the + While the remote fetch is in-flight, any further attempts to re-fetch the same record will be deferred until the fetch completes. */ static int setup_deferred_fetch_locks(struct ctdb_db_context *ctdb_db, struct ctdb_call *call) @@ -666,7 +666,7 @@ static int setup_deferred_fetch_locks(struct ctdb_db_context *ctdb_db, struct ct talloc_set_destructor(dfq, deferred_fetch_queue_destructor); - /* if the fetch havent completed in 30 seconds, just tear it all down + /* If the fetch hasn't completed in 30 seconds, just tear it all down and let it try again as the events are reissued */ tevent_add_timer(ctdb_db->ctdb->ev, dfq, timeval_current_ofs(30, 0), dfq_timeout, dfq); @@ -727,7 +727,7 @@ static int requeue_duplicate_fetch(struct ctdb_db_context *ctdb_db, struct ctdb_ this is called when the ctdb daemon received a ctdb request call from a local client over the unix domain socket */ -static void daemon_request_call_from_client(struct ctdb_client *client, +static void daemon_request_call_from_client(struct ctdb_client *client, struct ctdb_req_call_old *c) { struct ctdb_call_state *state; @@ -765,12 +765,12 @@ static void daemon_request_call_from_client(struct ctdb_client *client, key.dsize = c->keylen; w = talloc(ctdb, struct ctdb_daemon_packet_wrap); - CTDB_NO_MEMORY_VOID(ctdb, w); + CTDB_NO_MEMORY_VOID(ctdb, w); w->ctdb = ctdb; w->client_id = client->client_id; - ret = ctdb_ltdb_lock_fetch_requeue(ctdb_db, key, &header, + ret = ctdb_ltdb_lock_fetch_requeue(ctdb_db, key, &header, (struct ctdb_req_header *)c, &data, daemon_incoming_packet_wrap, w, true); if (ret == -2) { @@ -856,7 +856,7 @@ static void daemon_request_call_from_client(struct ctdb_client *client, CTDB_DECREMENT_STAT(ctdb, pending_calls); return; - } + } dstate = talloc(client, struct daemon_call_state); if (dstate == NULL) { @@ -895,7 +895,7 @@ static void daemon_request_call_from_client(struct ctdb_client *client, call->flags = c->flags; if (c->flags & CTDB_WANT_READONLY) { - /* client wants readonly record, so translate this into a + /* client wants readonly record, so translate this into a fetch with header. remember what the client asked for so we can remap the reply back to the proper format for the client in the reply @@ -938,7 +938,7 @@ static void daemon_request_call_from_client(struct ctdb_client *client, } -static void daemon_request_control_from_client(struct ctdb_client *client, +static void daemon_request_control_from_client(struct ctdb_client *client, struct ctdb_req_control_old *c); static void daemon_request_tunnel_from_client(struct ctdb_client *client, struct ctdb_req_tunnel_old *c); @@ -1013,7 +1013,7 @@ static void ctdb_daemon_read_cb(uint8_t *data, size_t cnt, void *args) CTDB_INCREMENT_STAT(client->ctdb, client_packets_recv); if (cnt < sizeof(*hdr)) { - ctdb_set_error(client->ctdb, "Bad packet length %u in daemon\n", + ctdb_set_error(client->ctdb, "Bad packet length %u in daemon\n", (unsigned)cnt); return; } @@ -1149,14 +1149,14 @@ static void ctdb_accept_client(struct tevent_context *ev, close(fd); talloc_free(client); return; - } + } client_pid->ctdb = ctdb; client_pid->pid = peer_pid; client_pid->client = client; DLIST_ADD(ctdb->client_pids, client_pid); - client->queue = ctdb_queue_setup(ctdb, client, fd, CTDB_DS_ALIGNMENT, + client->queue = ctdb_queue_setup(ctdb, client, fd, CTDB_DS_ALIGNMENT, ctdb_daemon_read_cb, client, "client-%u", client->pid); @@ -1708,8 +1708,8 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, allocate a packet for use in daemon<->daemon communication */ struct ctdb_req_header *_ctdb_transport_allocate(struct ctdb_context *ctdb, - TALLOC_CTX *mem_ctx, - enum ctdb_operation operation, + TALLOC_CTX *mem_ctx, + enum ctdb_operation operation, size_t length, size_t slength, const char *type) { @@ -1740,7 +1740,7 @@ struct ctdb_req_header *_ctdb_transport_allocate(struct ctdb_context *ctdb, hdr->generation = ctdb->vnn_map->generation; hdr->srcnode = ctdb->pnn; - return hdr; + return hdr; } struct daemon_control_state { @@ -1755,11 +1755,11 @@ struct daemon_control_state { callback when a control reply comes in */ static void daemon_control_callback(struct ctdb_context *ctdb, - int32_t status, TDB_DATA data, + int32_t status, TDB_DATA data, const char *errormsg, void *private_data) { - struct daemon_control_state *state = talloc_get_type(private_data, + struct daemon_control_state *state = talloc_get_type(private_data, struct daemon_control_state); struct ctdb_client *client = state->client; struct ctdb_reply_control_old *r; @@ -1771,7 +1771,7 @@ static void daemon_control_callback(struct ctdb_context *ctdb, if (errormsg) { len += strlen(errormsg); } - r = ctdbd_allocate_pkt(ctdb, state, CTDB_REPLY_CONTROL, len, + r = ctdbd_allocate_pkt(ctdb, state, CTDB_REPLY_CONTROL, len, struct ctdb_reply_control_old); CTDB_NO_MEMORY_VOID(ctdb, r); @@ -1799,7 +1799,7 @@ void ctdb_daemon_cancel_controls(struct ctdb_context *ctdb, struct ctdb_node *no struct daemon_control_state *state; while ((state = node->pending_controls)) { DLIST_REMOVE(node->pending_controls, state); - daemon_control_callback(ctdb, (uint32_t)-1, tdb_null, + daemon_control_callback(ctdb, (uint32_t)-1, tdb_null, "node is disconnected", state); } } @@ -1819,7 +1819,7 @@ static int daemon_control_destructor(struct daemon_control_state *state) this is called when the ctdb daemon received a ctdb request control from a local client over the unix domain socket */ -static void daemon_request_control_from_client(struct ctdb_client *client, +static void daemon_request_control_from_client(struct ctdb_client *client, struct ctdb_req_control_old *c) { TDB_DATA data; @@ -1849,7 +1849,7 @@ static void daemon_request_control_from_client(struct ctdb_client *client, if (c->flags & CTDB_CTRL_FLAG_NOREPLY) { talloc_steal(tmp_ctx, state); } - + data.dptr = &c->data[0]; data.dsize = c->datalen; res = ctdb_daemon_send_control(client->ctdb, c->hdr.destnode, @@ -1916,7 +1916,7 @@ int ctdb_daemon_set_call(struct ctdb_context *ctdb, uint32_t db_id, call->fn = fn; call->id = id; - DLIST_ADD(ctdb_db->calls, call); + DLIST_ADD(ctdb_db->calls, call); return 0; } @@ -2066,7 +2066,7 @@ int32_t ctdb_control_register_notify(struct ctdb_context *ctdb, uint32_t client_ nl->data.dptr = talloc_memdup(nl, notify->notify_data, nl->data.dsize); CTDB_NO_MEMORY(ctdb, nl->data.dptr); -- Samba Shared Repository