From c5cfc83a3e045d87e1fe73160523282eec2314ec Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 26 Oct 2011 11:36:21 +0200 Subject: [PATCH] s3-ctdb: Make ctdbd_process_exists use ctdbd_processes_exist Not strictly necessary, but more code exercise is good --- source3/lib/ctdbd_conn.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index f172bdfed47..7733f1ecd82 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -914,22 +914,17 @@ static NTSTATUS ctdbd_control(struct ctdbd_connection *conn, */ bool ctdbd_process_exists(struct ctdbd_connection *conn, uint32 vnn, pid_t pid) { - NTSTATUS status; - TDB_DATA data; - int32_t cstatus; + struct server_id id; + bool result; - data.dptr = (uint8_t*)&pid; - data.dsize = sizeof(pid); + id.pid = pid; + id.vnn = vnn; - status = ctdbd_control(conn, vnn, CTDB_CONTROL_PROCESS_EXISTS, 0, 0, - data, NULL, NULL, &cstatus); - if (!NT_STATUS_IS_OK(status)) { - DEBUG(0, (__location__ " ctdb_control for process_exists " - "failed\n")); - return False; + if (!ctdb_processes_exist(conn, &id, 1, &result)) { + DEBUG(10, ("ctdb_processes_exist failed\n")); + return false; } - - return cstatus == 0; + return result; } bool ctdb_processes_exist(struct ctdbd_connection *conn, -- 2.34.1