diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-31 16:52:56 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-31 17:07:41 +0200 |
| commit | 5648c3f67eeebee0a17cf9e7b64fb2cbfe2e2e68 (patch) | |
| tree | 4623f3f0cb705b3151febb3c1952b8925b44b1ff /source3/lib/g_lock.c | |
| parent | 808ceac9f54bb3988fc2bb6b0d86eaded07283e1 (diff) | |
| download | samba-5648c3f67eeebee0a17cf9e7b64fb2cbfe2e2e68.tar.gz samba-5648c3f67eeebee0a17cf9e7b64fb2cbfe2e2e68.tar.bz2 samba-5648c3f67eeebee0a17cf9e7b64fb2cbfe2e2e68.zip | |
s3: messaging_ctdbd_connection() was only called with procid_self()
Eventually we'll get this right...
Diffstat (limited to 'source3/lib/g_lock.c')
| -rw-r--r-- | source3/lib/g_lock.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c index 42bf3b0916..6e4c6d796c 100644 --- a/source3/lib/g_lock.c +++ b/source3/lib/g_lock.c @@ -312,8 +312,7 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name, #ifdef CLUSTER_SUPPORT if (lp_clustering()) { - struct server_id my_id = messaging_server_id(ctx->msg); - status = ctdb_watch_us(messaging_ctdbd_connection(my_id)); + status = ctdb_watch_us(messaging_ctdbd_connection()); if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("could not register retry with ctdb: %s\n", nt_errstr(status))); @@ -388,11 +387,8 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name, #ifdef CLUSTER_SUPPORT if (lp_clustering()) { - struct server_id my_id; struct ctdbd_connection *conn; - - my_id = messaging_server_id(ctx->msg); - conn = messaging_ctdbd_connection(my_id); + conn = messaging_ctdbd_connection(); r_fds = &_r_fds; FD_ZERO(r_fds); @@ -597,8 +593,7 @@ NTSTATUS g_lock_unlock(struct g_lock_ctx *ctx, const char *name) #ifdef CLUSTER_SUPPORT if (lp_clustering()) { - struct server_id my_id = messaging_server_id(ctx->msg); - ctdb_unwatch(messaging_ctdbd_connection(my_id)); + ctdb_unwatch(messaging_ctdbd_connection()); } #endif return status; |