Attachment 11256 Details for Bug 11398 – Patch for v4-2 branch

[patch] Patch for v4-2 branch

0001-ctdb-daemon-Return-correct-sequence-number-for-CONTR.patch (text/plain), 1.35 KB, created by Amitay Isaacs on 2015-07-14 11:19:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2015-07-14 11:19:05 UTC

Size: 1.35 KB

patch

obsolete

>From 88af7a826aa4b9d9c948e566570c3dd5f98ac935 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Tue, 14 Jul 2015 16:54:59 +1000
>Subject: [PATCH] ctdb-daemon: Return correct sequence number for
> CONTROL_GET_DB_SEQNUM
>
>Due to the missing cast of uint64_t, CONTROL_GET_DB_SEQNUM always returned
>seqnum <= 256.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11398
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>
>Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
>Autobuild-Date(master): Tue Jul 14 13:03:25 CEST 2015 on sn-devel-104
>
>(cherry picked from commit 1023db2543f7785e4527a4565db91edcde4ca7f1)
>---
> ctdb/server/ctdb_persistent.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
>diff --git a/ctdb/server/ctdb_persistent.c b/ctdb/server/ctdb_persistent.c
>index e28622f..5c54b9e 100644
>--- a/ctdb/server/ctdb_persistent.c
>+++ b/ctdb/server/ctdb_persistent.c
>@@ -369,14 +369,11 @@ int32_t ctdb_control_get_db_seqnum(struct ctdb_context *ctdb,
> 	}
> 
> 	outdata->dsize = sizeof(uint64_t);
>-	outdata->dptr = (uint8_t *)talloc_zero(outdata, uint64_t);
>+	outdata->dptr = talloc_memdup(outdata, &seqnum, sizeof(uint64_t));
> 	if (outdata->dptr == NULL) {
> 		ret = -1;
>-		goto done;
> 	}
> 
>-	*(outdata->dptr) = seqnum;
>-
> done:
> 	return ret;
> }
>-- 
>2.4.3
>

Flags:

vl: review+
martins: review+

Actions: View

Attachments on bug 11398: 11254 | 11255 | 11256