[PATCH] Correct "cstatus" argument of ctdbd_control_local
Volker Lendecke
Volker.Lendecke at SerNet.DE
Thu Apr 21 11:35:05 UTC 2016
Hi!
A patch on top of
https://lists.samba.org/archive/samba-technical/2016-April/113541.html
Review appreciated!
Thanks,
Volker
--
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From c8c1afeb9219b6fa8ca33407e75ad53002ea1013 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Thu, 21 Apr 2016 13:31:39 +0200
Subject: [PATCH] ctdbd_conn: Make "cstatus" int32_t
This converts the "cstatus" parameter of ctdbd_control_local to what it is
defined as in the packet: int32_t. It was used inconsistently throughout the
code.
Signed-off-by: Volker Lendecke <vl at samba.org>
---
source3/include/ctdbd_conn.h | 2 +-
source3/lib/ctdbd_conn.c | 15 ++++++++-------
source3/lib/dbwrap/dbwrap_ctdb.c | 14 +++++++-------
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index bf371e6..c91f700 100644
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -84,7 +84,7 @@ int ctdbd_register_ips(struct ctdbd_connection *conn,
int ctdbd_control_local(struct ctdbd_connection *conn, uint32_t opcode,
uint64_t srvid, uint32_t flags, TDB_DATA data,
TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
- int *cstatus);
+ int32_t *cstatus);
int ctdb_watch_us(struct ctdbd_connection *conn);
int ctdb_unwatch(struct ctdbd_connection *conn);
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 391ba8d..d0cade3 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -72,7 +72,7 @@ static int ctdbd_control(struct ctdbd_connection *conn,
uint64_t srvid, uint32_t flags,
TDB_DATA data,
TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
- int *cstatus);
+ int32_t *cstatus);
/*
* exit on fatal communications errors with the ctdbd daemon
@@ -112,7 +112,8 @@ int register_with_ctdbd(struct ctdbd_connection *conn, uint64_t srvid,
void *private_data)
{
- int ret, cstatus;
+ int ret;
+ int32_t cstatus;
size_t num_callbacks;
struct ctdbd_srvid_cb *tmp;
@@ -613,7 +614,7 @@ static int ctdbd_control(struct ctdbd_connection *conn,
uint64_t srvid, uint32_t flags,
TDB_DATA data,
TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
- int *cstatus)
+ int32_t *cstatus)
{
struct ctdb_req_control_old req;
struct ctdb_req_header *hdr;
@@ -1026,7 +1027,7 @@ int ctdbd_traverse(struct ctdbd_connection *conn, uint32_t db_id,
int ret;
TDB_DATA key, data;
struct ctdb_traverse_start t;
- int cstatus;
+ int32_t cstatus;
t.db_id = db_id;
t.srvid = conn->rand_srvid;
@@ -1200,7 +1201,7 @@ int ctdbd_register_ips(struct ctdbd_connection *conn,
int ctdbd_control_local(struct ctdbd_connection *conn, uint32_t opcode,
uint64_t srvid, uint32_t flags, TDB_DATA data,
TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
- int *cstatus)
+ int32_t *cstatus)
{
return ctdbd_control(conn, CTDB_CURRENT_NODE, opcode, srvid, flags, data,
mem_ctx, outdata, cstatus);
@@ -1211,7 +1212,7 @@ int ctdb_watch_us(struct ctdbd_connection *conn)
struct ctdb_notify_data_old reg_data;
size_t struct_len;
int ret;
- int cstatus;
+ int32_t cstatus;
reg_data.srvid = CTDB_SRVID_SAMBA_NOTIFY;
reg_data.len = 1;
@@ -1235,7 +1236,7 @@ int ctdb_unwatch(struct ctdbd_connection *conn)
{
uint64_t srvid = CTDB_SRVID_SAMBA_NOTIFY;
int ret;
- int cstatus;
+ int32_t cstatus;
ret = ctdbd_control_local(
conn, CTDB_CONTROL_DEREGISTER_NOTIFY, conn->rand_srvid, 0,
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 59c0c78..1e4df09 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -700,7 +700,7 @@ static int db_ctdb_transaction_commit(struct db_context *db)
struct db_ctdb_ctx *ctx = talloc_get_type_abort(db->private_data,
struct db_ctdb_ctx);
NTSTATUS rets;
- int status;
+ int32_t status;
struct db_ctdb_transaction_handle *h = ctx->transaction;
uint64_t old_seqnum, new_seqnum;
int ret;
@@ -855,7 +855,7 @@ static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec)
int ret;
struct ctdb_control_schedule_for_deletion *dd;
TDB_DATA indata;
- int cstatus;
+ int32_t cstatus;
struct db_ctdb_rec *crec = talloc_get_type_abort(
rec->private_data, struct db_ctdb_rec);
@@ -884,7 +884,7 @@ static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec)
if ((ret != 0) || cstatus != 0) {
DEBUG(1, (__location__ " Error sending local control "
- "SCHEDULE_FOR_DELETION: %s, cstatus = %d\n",
+ "SCHEDULE_FOR_DELETION: %s, cstatus = %"PRIi32"\n",
strerror(ret), cstatus));
if (ret != 0) {
status = map_nt_error_from_unix(ret);
@@ -1580,7 +1580,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
struct ctdbd_connection *conn;
struct loadparm_context *lp_ctx;
struct ctdb_db_priority prio;
- int cstatus;
+ int32_t cstatus;
int ret;
if (!lp_clustering()) {
@@ -1643,8 +1643,8 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
NULL, NULL, &cstatus);
if ((ret != 0) || (cstatus != 0)) {
- DEBUG(1, ("CTDB_CONTROL_SET_DB_PRIORITY failed: %s, %d\n",
- strerror(ret), cstatus));
+ DEBUG(1, ("CTDB_CONTROL_SET_DB_PRIORITY failed: %s, "
+ "%"PRIi32"\n", strerror(ret), cstatus));
TALLOC_FREE(result);
return NULL;
}
@@ -1662,7 +1662,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
NULL, NULL, &cstatus);
if ((ret != 0) || (cstatus != 0)) {
DEBUG(1, ("CTDB_CONTROL_SET_DB_READONLY failed: "
- "%s, %d\n", strerror(ret), cstatus));
+ "%s, %"PRIi32"\n", strerror(ret), cstatus));
TALLOC_FREE(result);
return NULL;
}
--
1.7.9.5
More information about the samba-technical
mailing list