diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-10-29 16:42:05 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2015-11-04 00:47:14 +0100 |
| commit | e1fed53e2abafcae8a5da9a3b24ee8db38b97441 (patch) | |
| tree | ea38777c2f0e9eea4b3721a126ef5212e43a752d /source3/lib | |
| parent | acf858defbe8672c91265e6e2afe45476ef0fba6 (diff) | |
| download | samba-e1fed53e2abafcae8a5da9a3b24ee8db38b97441.tar.gz | |
ctdb-daemon: Rename struct ctdb_req_control to ctdb_req_control_old
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/ctdbd_conn.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 836d97170fc..b9ca94779bd 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -640,7 +640,7 @@ static int ctdbd_control(struct ctdbd_connection *conn, TALLOC_CTX *mem_ctx, TDB_DATA *outdata, int *cstatus) { - struct ctdb_req_control req; + struct ctdb_req_control_old req; struct ctdb_req_header *hdr; struct ctdb_reply_control *reply = NULL; struct iovec iov[2]; @@ -648,7 +648,7 @@ static int ctdbd_control(struct ctdbd_connection *conn, int ret; ZERO_STRUCT(req); - req.hdr.length = offsetof(struct ctdb_req_control, data) + data.dsize; + req.hdr.length = offsetof(struct ctdb_req_control_old, data) + data.dsize; req.hdr.ctdb_magic = CTDB_MAGIC; req.hdr.ctdb_version = CTDB_PROTOCOL; req.hdr.operation = CTDB_REQ_CONTROL; @@ -663,7 +663,7 @@ static int ctdbd_control(struct ctdbd_connection *conn, ctdb_packet_dump(&req.hdr); iov[0].iov_base = &req; - iov[0].iov_len = offsetof(struct ctdb_req_control, data); + iov[0].iov_len = offsetof(struct ctdb_req_control_old, data); iov[1].iov_base = data.dptr; iov[1].iov_len = data.dsize; @@ -742,7 +742,7 @@ bool ctdb_processes_exist(struct ctdbd_connection *conn, } for (i=0; i<num_pids; i++) { - struct ctdb_req_control req; + struct ctdb_req_control_old req; pid_t pid; struct iovec iov[2]; ssize_t nwritten; @@ -762,7 +762,7 @@ bool ctdb_processes_exist(struct ctdbd_connection *conn, (int)pids[i].vnn, (int)pid, (int)reqids[i])); - req.hdr.length = offsetof(struct ctdb_req_control, data); + req.hdr.length = offsetof(struct ctdb_req_control_old, data); req.hdr.length += sizeof(pid); req.hdr.ctdb_magic = CTDB_MAGIC; req.hdr.ctdb_version = CTDB_PROTOCOL; @@ -778,7 +778,7 @@ bool ctdb_processes_exist(struct ctdbd_connection *conn, ctdb_packet_dump(&req.hdr); iov[0].iov_base = &req; - iov[0].iov_len = offsetof(struct ctdb_req_control, data); + iov[0].iov_len = offsetof(struct ctdb_req_control_old, data); iov[1].iov_base = &pid; iov[1].iov_len = sizeof(pid); |