summaryrefslogtreecommitdiff
path: root/source3/lib/g_lock.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-12-12 14:55:54 +0100
committerVolker Lendecke <vlendec@samba.org>2011-12-12 21:50:25 +0100
commit0f9d14820e222233d63b7a79b4b1ff044332ef41 (patch)
treed3e48dcf07b6d8364ac7cabf80391b626b5509fb /source3/lib/g_lock.c
parent77dc976b53490e06dff649f199033fe799b714bf (diff)
downloadsamba-0f9d14820e222233d63b7a79b4b1ff044332ef41.tar.gz
samba-0f9d14820e222233d63b7a79b4b1ff044332ef41.tar.bz2
samba-0f9d14820e222233d63b7a79b4b1ff044332ef41.zip
s3: Remove a bunch of calls to procid_self()
All callers to messaging_[re]init only used procid_self()
Diffstat (limited to 'source3/lib/g_lock.c')
-rw-r--r--source3/lib/g_lock.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 65d7c44295..561617023f 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -748,7 +748,6 @@ NTSTATUS g_lock_get(struct g_lock_ctx *ctx, const char *name,
static bool g_lock_init_all(TALLOC_CTX *mem_ctx,
struct tevent_context **pev,
struct messaging_context **pmsg,
- const struct server_id self,
struct g_lock_ctx **pg_ctx)
{
struct tevent_context *ev = NULL;
@@ -760,7 +759,7 @@ static bool g_lock_init_all(TALLOC_CTX *mem_ctx,
d_fprintf(stderr, "ERROR: could not init event context\n");
goto fail;
}
- msg = messaging_init(mem_ctx, self, ev);
+ msg = messaging_init(mem_ctx, ev);
if (msg == NULL) {
d_fprintf(stderr, "ERROR: could not init messaging context\n");
goto fail;
@@ -783,7 +782,7 @@ fail:
}
NTSTATUS g_lock_do(const char *name, enum g_lock_type lock_type,
- struct timeval timeout, const struct server_id self,
+ struct timeval timeout,
void (*fn)(void *private_data), void *private_data)
{
struct tevent_context *ev = NULL;
@@ -791,7 +790,7 @@ NTSTATUS g_lock_do(const char *name, enum g_lock_type lock_type,
struct g_lock_ctx *g_ctx = NULL;
NTSTATUS status;
- if (!g_lock_init_all(talloc_tos(), &ev, &msg, self, &g_ctx)) {
+ if (!g_lock_init_all(talloc_tos(), &ev, &msg, &g_ctx)) {
status = NT_STATUS_ACCESS_DENIED;
goto done;
}