diff options
| author | Jeremy Allison <jra@samba.org> | 2010-04-29 16:50:15 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-04-29 16:50:15 -0700 |
| commit | ebf6340bb568f279fc8b94856e01de473bd08575 (patch) | |
| tree | be6328d01153660b2221161209d42fabae0e4178 /source3/smbd/globals.h | |
| parent | f2ccff806a5118ff1ff8a24aa85f56be61906d3a (diff) | |
| download | samba-ebf6340bb568f279fc8b94856e01de473bd08575.tar.gz samba-ebf6340bb568f279fc8b94856e01de473bd08575.tar.bz2 samba-ebf6340bb568f279fc8b94856e01de473bd08575.zip | |
Move the global blocking lock records into the smb1 state.
Jeremy
Diffstat (limited to 'source3/smbd/globals.h')
| -rw-r--r-- | source3/smbd/globals.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 6f3b51be93..614d8fcdb5 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -26,18 +26,6 @@ extern int aio_pending_size; extern int outstanding_aio_calls; #endif -/* dlink list we store pending lock records on. */ -extern struct blocking_lock_record *blocking_lock_queue; - -/* dlink list we move cancelled lock records onto. */ -extern struct blocking_lock_record *blocking_lock_cancelled_queue; - -/* The event that makes us process our blocking lock queue */ -extern struct timed_event *brl_timeout; - -extern bool blocking_lock_unlock_state; -extern bool blocking_lock_cancel_state; - #ifdef USE_DMAPI struct smbd_dmapi_context; extern struct smbd_dmapi_context *dmapi_ctx; @@ -551,6 +539,18 @@ struct smbd_server_connection { struct dptr_struct *dirptrs; int dirhandles_open; } searches; + struct { + /* dlink list we store pending lock records on. */ + struct blocking_lock_record *blocking_lock_queue; + /* dlink list we move cancelled lock records onto. */ + struct blocking_lock_record *blocking_lock_cancelled_queue; + + /* The event that makes us process our blocking lock queue */ + struct timed_event *brl_timeout; + + bool blocking_lock_unlock_state; + bool blocking_lock_cancel_state; + } locks; } smb1; struct { struct tevent_context *event_ctx; |