diff options
| author | Volker Lendecke <vl@samba.org> | 2010-07-04 16:54:04 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-07-05 11:06:23 +0200 |
| commit | 300667e4a9f02104fc8759dd846ea41f400441bf (patch) | |
| tree | d0795152861ba866c49778e59fc5f4a48b98e2cc /source3/lib/g_lock.c | |
| parent | 849f72b254ee52501ba46e8419938d3bf5e31900 (diff) | |
| download | samba-300667e4a9f02104fc8759dd846ea41f400441bf.tar.gz samba-300667e4a9f02104fc8759dd846ea41f400441bf.tar.bz2 samba-300667e4a9f02104fc8759dd846ea41f400441bf.zip | |
s3: Pass procid_self() explicitly to messaging_ctdbd_connection()
Diffstat (limited to 'source3/lib/g_lock.c')
| -rw-r--r-- | source3/lib/g_lock.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c index d7828e228f..49f719b5fc 100644 --- a/source3/lib/g_lock.c +++ b/source3/lib/g_lock.c @@ -312,7 +312,8 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name, #ifdef CLUSTER_SUPPORT if (lp_clustering()) { - status = ctdb_watch_us(messaging_ctdbd_connection()); + status = ctdb_watch_us( + messaging_ctdbd_connection(procid_self())); if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("could not register retry with ctdb: %s\n", nt_errstr(status))); @@ -387,7 +388,9 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name, #ifdef CLUSTER_SUPPORT if (lp_clustering()) { - struct ctdbd_connection *conn = messaging_ctdbd_connection(); + struct ctdbd_connection *conn; + + conn = messaging_ctdbd_connection(procid_self()); r_fds = &_r_fds; FD_ZERO(r_fds); @@ -592,7 +595,7 @@ NTSTATUS g_lock_unlock(struct g_lock_ctx *ctx, const char *name) #ifdef CLUSTER_SUPPORT if (lp_clustering()) { - ctdb_unwatch(messaging_ctdbd_connection()); + ctdb_unwatch(messaging_ctdbd_connection(procid_self())); } #endif return status; |