diff options
| author | Volker Lendecke <vl@samba.org> | 2011-08-19 17:05:36 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-08-22 17:11:07 +0200 |
| commit | da528a65b14304b7e9fd876f043a994291870c53 (patch) | |
| tree | ebc8356d77207cfdd5658465ad6b79f1b2652f84 | |
| parent | 21bb8abc936ebf2f5e57b20ef0508fdcc617058d (diff) | |
| download | samba-da528a65b14304b7e9fd876f043a994291870c53.tar.gz samba-da528a65b14304b7e9fd876f043a994291870c53.tar.xz samba-da528a65b14304b7e9fd876f043a994291870c53.zip | |
libctdb: "unpack_reply_call" does not need the ctdb_connection parameter
Signed-off-by: Michael Adam <obnox@samba.org>
(This used to be ctdb commit 77ae553249ef1e1d467d792ac033f2aaa4e337e6)
| -rw-r--r-- | ctdb/libctdb/ctdb.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ctdb/libctdb/ctdb.c b/ctdb/libctdb/ctdb.c index 2566f50dbe..573e22961c 100644 --- a/ctdb/libctdb/ctdb.c +++ b/ctdb/libctdb/ctdb.c @@ -275,8 +275,7 @@ void ctdb_request_free(struct ctdb_request *req) } /* Sanity-checking wrapper for reply. */ -static struct ctdb_reply_call *unpack_reply_call(struct ctdb_connection *ctdb, - struct ctdb_request *req, +static struct ctdb_reply_call *unpack_reply_call(struct ctdb_request *req, uint32_t callid) { size_t len; @@ -285,7 +284,7 @@ static struct ctdb_reply_call *unpack_reply_call(struct ctdb_connection *ctdb, /* Library user error if this isn't a reply to a call. */ if (req->hdr.hdr->operation != CTDB_REQ_CALL) { errno = EINVAL; - DEBUG(ctdb, LOG_ALERT, + DEBUG(req->ctdb, LOG_ALERT, "This was not a ctdbd call request: operation %u", req->hdr.hdr->operation); return NULL; @@ -293,7 +292,7 @@ static struct ctdb_reply_call *unpack_reply_call(struct ctdb_connection *ctdb, if (req->hdr.call->callid != callid) { errno = EINVAL; - DEBUG(ctdb, LOG_ALERT, + DEBUG(req->ctdb, LOG_ALERT, "This was not a ctdbd %u call request: %u", callid, req->hdr.call->callid); return NULL; @@ -302,7 +301,7 @@ static struct ctdb_reply_call *unpack_reply_call(struct ctdb_connection *ctdb, /* ctdbd or our error if this isn't a reply call. */ if (len < sizeof(*inhdr) || inhdr->hdr.operation != CTDB_REPLY_CALL) { errno = EIO; - DEBUG(ctdb, LOG_CRIT, + DEBUG(req->ctdb, LOG_CRIT, "Invalid ctdbd call reply: len %zu, operation %u", len, inhdr->hdr.operation); return NULL; @@ -814,7 +813,7 @@ static void readrecordlock_retry(struct ctdb_connection *ctdb, TDB_DATA data; /* OK, we've received reply to noop migration */ - reply = unpack_reply_call(ctdb, req, CTDB_NULL_FUNC); + reply = unpack_reply_call(req, CTDB_NULL_FUNC); if (!reply || reply->status != 0) { if (reply) { DEBUG(ctdb, LOG_ERR, |