The Samba-Bugzilla – Attachment 12465 Details for
Bug 12259
CTDB recovery does not complete on big-endian ppc64
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patches for v4-4 branch
BZ12259-v4-4.patch (text/plain), 2.53 KB, created by
Amitay Isaacs
on 2016-09-15 01:39:30 UTC
(
hide
)
Description:
Patches for v4-4 branch
Filename:
MIME Type:
Creator:
Amitay Isaacs
Created:
2016-09-15 01:39:30 UTC
Size:
2.53 KB
patch
obsolete
>From 501dd393e71fae9a652ae400815b6b0e02d221e6 Mon Sep 17 00:00:00 2001 >From: Amitay Isaacs <amitay@gmail.com> >Date: Tue, 13 Sep 2016 16:05:14 +1000 >Subject: [PATCH] ctdb-protocol: Fix marshalling for GET_DB_SEQNUM control > request > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=12259 > >Even though database id is 32-bit, it's sent on wire as 64-bits. >The database id is the first 32-bits on the wire. This needs fixing >eventually, but for now keep the same wire format. > >Signed-off-by: Amitay Isaacs <amitay@gmail.com> >Reviewed-by: Martin Schwenke <martin@meltin.net> >(cherry picked from commit bdff6255af113827340adc3da609e127503d9ba5) >--- > ctdb/protocol/protocol_control.c | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) > >diff --git a/ctdb/protocol/protocol_control.c b/ctdb/protocol/protocol_control.c >index e7487da..3a51b65 100644 >--- a/ctdb/protocol/protocol_control.c >+++ b/ctdb/protocol/protocol_control.c >@@ -49,7 +49,6 @@ struct ctdb_reply_control_wire { > static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd) > { > size_t len = 0; >- uint64_t u64; > > if (cd == NULL) { > return 0; >@@ -384,8 +383,7 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd) > break; > > case CTDB_CONTROL_GET_DB_SEQNUM: >- u64 = cd->data.db_id; >- len = ctdb_uint64_len(u64); >+ len = ctdb_uint64_len((uint64_t)cd->data.db_id); > break; > > case CTDB_CONTROL_DB_SET_HEALTHY: >@@ -501,8 +499,6 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd) > static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd, > uint8_t *buf) > { >- uint64_t u64; >- > switch (cd->opcode) { > case CTDB_CONTROL_PROCESS_EXISTS: > ctdb_pid_push(cd->data.pid, buf); >@@ -724,8 +720,7 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd, > break; > > case CTDB_CONTROL_GET_DB_SEQNUM: >- u64 = cd->data.db_id; >- ctdb_uint64_push(u64, buf); >+ ctdb_uint32_push(cd->data.db_id, buf); > break; > > case CTDB_CONTROL_DB_SET_HEALTHY: >@@ -824,7 +819,6 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen, > struct ctdb_req_control_data *cd) > { > int ret = 0; >- uint64_t u64 = 0; > > cd->opcode = opcode; > >@@ -1103,8 +1097,8 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen, > break; > > case CTDB_CONTROL_GET_DB_SEQNUM: >- ret = ctdb_uint64_pull(buf, buflen, mem_ctx, &u64); >- cd->data.db_id = (uint32_t)u64; >+ ret = ctdb_uint32_pull(buf, buflen, mem_ctx, >+ &cd->data.db_id); > break; > > case CTDB_CONTROL_DB_SET_HEALTHY: >-- >2.7.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
martins
:
review+
Actions:
View
Attachments on
bug 12259
:
12464
| 12465