summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2007-04-17 23:40:33 +0200
committerVolker Lendecke <vl@samba.org>2007-04-17 23:40:33 +0200
commit27837c197aaf221019d3d0d25896653b5f87659f (patch)
tree77e4920c181ef9d46b08b8e12cd75b3f1802a86e
parented32ad028c8f947d111e5807829650b030f31de9 (diff)
downloadsamba-27837c197aaf221019d3d0d25896653b5f87659f.tar.gz
samba-27837c197aaf221019d3d0d25896653b5f87659f.tar.xz
samba-27837c197aaf221019d3d0d25896653b5f87659f.zip
Clean up the call_states correctly
(This used to be ctdb commit 9fcc40a2ddd8f7f62bdd8b5ab71d182220e23af0)
-rw-r--r--ctdb/common/ctdb_call.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/common/ctdb_call.c b/ctdb/common/ctdb_call.c
index 4363b189cc..aa88829fa1 100644
--- a/ctdb/common/ctdb_call.c
+++ b/ctdb/common/ctdb_call.c
@@ -436,7 +436,7 @@ void ctdb_reply_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
state->call.reply_data.dsize = c->datalen;
state->call.status = c->status;
- talloc_steal(state, c);
+ talloc_steal(c, state);
/* get an extra reference here - this prevents the free in ctdb_recv_pkt()
from freeing the data */
@@ -477,7 +477,7 @@ void ctdb_reply_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
data.dptr = c->data;
data.dsize = c->datalen;
- talloc_steal(state, c);
+ talloc_steal(c, state);
/* we're now the dmaster - update our local ltdb with new header
and data */
@@ -514,7 +514,7 @@ void ctdb_reply_error(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
return;
}
- talloc_steal(state, c);
+ talloc_steal(c, state);
state->state = CTDB_CALL_ERROR;
state->errmsg = (char *)c->msg;
@@ -544,7 +544,7 @@ void ctdb_reply_redirect(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
return;
}
- talloc_steal(state, c);
+ talloc_steal(c, state);
/* don't allow for too many redirects */
if (state->redirect_count++ == CTDB_MAX_REDIRECT) {