diff options
| author | Jeremy Allison <jra@samba.org> | 2010-02-12 22:21:19 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-04-01 09:39:16 +0200 |
| commit | 870a9edb56c0f0a4e31a339a1860943707f76e54 (patch) | |
| tree | e3e5e7594b659ddb403144ea97a2a94c9d96b4c9 /source3/lib | |
| parent | a93751c7ec923e1ca08a0cfed4bb7e44dd8e281c (diff) | |
| download | samba-870a9edb56c0f0a4e31a339a1860943707f76e54.tar.gz | |
Fix warning messages on compile in g_lock.c Volker & Michael please check.
Jeremy.
(cherry picked from commit 10e54fb422d9f1ae6d33e5fabbf8c651b0e57a8c)
(cherry picked from commit d0ce7072bd89d11bb63b1fa976305d7087dcb9af)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/g_lock.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c index 8a44b22e11f..37fb7ce3b8d 100644 --- a/source3/lib/g_lock.c +++ b/source3/lib/g_lock.c @@ -149,10 +149,6 @@ static void g_lock_got_retry(struct messaging_context *msg, uint32_t msg_type, struct server_id server_id, DATA_BLOB *data); -static void g_lock_timedout(struct tevent_context *ev, - struct tevent_timer *te, - struct timeval current_time, - void *private_data); static NTSTATUS g_lock_trylock(struct g_lock_ctx *ctx, const char *name, enum g_lock_type lock_type) @@ -302,7 +298,9 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name, timeout_end = timeval_sum(&time_now, &timeout); while (true) { +#ifdef CLUSTER_SUPPORT fd_set _r_fds; +#endif fd_set *r_fds = NULL; int max_fd = 0; int ret; @@ -404,7 +402,9 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name, */ } +#ifdef CLUSTER_SUPPORT done: +#endif if (!NT_STATUS_IS_OK(status)) { NTSTATUS unlock_status; @@ -437,16 +437,6 @@ static void g_lock_got_retry(struct messaging_context *msg, *pretry = true; } -static void g_lock_timedout(struct tevent_context *ev, - struct tevent_timer *te, - struct timeval current_time, - void *private_data) -{ - bool *ptimedout = (bool *)private_data; - *ptimedout = true; - TALLOC_FREE(te); -} - static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx, const char *name, struct server_id pid) { |