diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-10-29 16:26:29 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2015-11-04 00:47:14 +0100 |
| commit | e0c42c5698f32ea6a3ec8aa93c380969bd110117 (patch) | |
| tree | 77949d2cd49709a9b30be4a391990ffea3582add /source3/lib | |
| parent | f55889d2c9630e088ae9b8058d29f9df6fb2a007 (diff) | |
| download | samba-e0c42c5698f32ea6a3ec8aa93c380969bd110117.tar.gz | |
ctdb-daemon: Rename struct ctdb_req_call to ctdb_req_call_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 bbe425e13d3..95179a854ec 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -918,7 +918,7 @@ int ctdbd_db_attach(struct ctdbd_connection *conn, */ int ctdbd_migrate(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key) { - struct ctdb_req_call req; + struct ctdb_req_call_old req; struct ctdb_req_header *hdr; struct iovec iov[2]; ssize_t nwritten; @@ -926,7 +926,7 @@ int ctdbd_migrate(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key) ZERO_STRUCT(req); - req.hdr.length = offsetof(struct ctdb_req_call, data) + key.dsize; + req.hdr.length = offsetof(struct ctdb_req_call_old, data) + key.dsize; req.hdr.ctdb_magic = CTDB_MAGIC; req.hdr.ctdb_version = CTDB_PROTOCOL; req.hdr.operation = CTDB_REQ_CALL; @@ -940,7 +940,7 @@ int ctdbd_migrate(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key) ctdb_packet_dump(&req.hdr); iov[0].iov_base = &req; - iov[0].iov_len = offsetof(struct ctdb_req_call, data); + iov[0].iov_len = offsetof(struct ctdb_req_call_old, data); iov[1].iov_base = key.dptr; iov[1].iov_len = key.dsize; @@ -976,7 +976,7 @@ int ctdbd_parse(struct ctdbd_connection *conn, uint32_t db_id, void *private_data), void *private_data) { - struct ctdb_req_call req; + struct ctdb_req_call_old req; struct ctdb_req_header *hdr = NULL; struct ctdb_reply_call *reply; struct iovec iov[2]; @@ -988,7 +988,7 @@ int ctdbd_parse(struct ctdbd_connection *conn, uint32_t db_id, ZERO_STRUCT(req); - req.hdr.length = offsetof(struct ctdb_req_call, data) + key.dsize; + req.hdr.length = offsetof(struct ctdb_req_call_old, data) + key.dsize; req.hdr.ctdb_magic = CTDB_MAGIC; req.hdr.ctdb_version = CTDB_PROTOCOL; req.hdr.operation = CTDB_REQ_CALL; @@ -999,7 +999,7 @@ int ctdbd_parse(struct ctdbd_connection *conn, uint32_t db_id, req.keylen = key.dsize; iov[0].iov_base = &req; - iov[0].iov_len = offsetof(struct ctdb_req_call, data); + iov[0].iov_len = offsetof(struct ctdb_req_call_old, data); iov[1].iov_base = key.dptr; iov[1].iov_len = key.dsize; |