diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-10-28 19:18:02 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2015-11-04 00:47:15 +0100 |
| commit | 1278a5a4ed527f3fe0f7150854d53b40835121ad (patch) | |
| tree | 9dd3ba3bcca759a19d3ce1cc80a6c4a7cbb9b8d0 | |
| parent | 64d8bb626bd17910628efe80835912299ec7c6a9 (diff) | |
| download | samba-1278a5a4ed527f3fe0f7150854d53b40835121ad.tar.gz | |
ctdb-daemon: Rename struct ctdb_control_set_tunable to ctdb_tunable_old
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
| -rw-r--r-- | ctdb/client/ctdb_client.c | 6 | ||||
| -rw-r--r-- | ctdb/include/ctdb_protocol.h | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_tunables.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index a1f1d378ab9..7fbb3471cbe 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -2693,16 +2693,16 @@ int ctdb_ctrl_set_tunable(struct ctdb_context *ctdb, uint32_t destnode, const char *name, uint32_t value) { - struct ctdb_control_set_tunable *t; + struct ctdb_tunable_old *t; TDB_DATA data; int32_t res; int ret; - data.dsize = offsetof(struct ctdb_control_set_tunable, name) + strlen(name) + 1; + data.dsize = offsetof(struct ctdb_tunable_old, name) + strlen(name) + 1; data.dptr = talloc_size(ctdb, data.dsize); CTDB_NO_MEMORY(ctdb, data.dptr); - t = (struct ctdb_control_set_tunable *)data.dptr; + t = (struct ctdb_tunable_old *)data.dptr; t->length = strlen(name)+1; memcpy(t->name, name, t->length); t->value = value; diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index c7f31af9323..7da0f33876b 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -957,7 +957,7 @@ struct ctdb_marshall_buffer { /* structure for setting a tunable */ -struct ctdb_control_set_tunable { +struct ctdb_tunable_old { uint32_t value; uint32_t length; uint8_t name[1]; diff --git a/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c index c333daefa1e..29c11ea6254 100644 --- a/ctdb/server/ctdb_tunables.c +++ b/ctdb/server/ctdb_tunables.c @@ -154,13 +154,13 @@ int32_t ctdb_control_get_tunable(struct ctdb_context *ctdb, TDB_DATA indata, */ int32_t ctdb_control_set_tunable(struct ctdb_context *ctdb, TDB_DATA indata) { - struct ctdb_control_set_tunable *t = - (struct ctdb_control_set_tunable *)indata.dptr; + struct ctdb_tunable_old *t = + (struct ctdb_tunable_old *)indata.dptr; char *name; int i; if (indata.dsize < sizeof(*t) || - t->length > indata.dsize - offsetof(struct ctdb_control_set_tunable, name)) { + t->length > indata.dsize - offsetof(struct ctdb_tunable_old, name)) { DEBUG(DEBUG_ERR,("Bad indata in ctdb_control_set_tunable\n")); return -1; } |