diff options
| author | Jeremy Allison <jra@samba.org> | 2010-04-30 21:03:20 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-04-30 21:03:20 -0700 |
| commit | f4092ecec722d7e2c04f3049630975af9e96bc07 (patch) | |
| tree | 34767dbbd6dad945552c0ea60d187172ecd6394c /source3/include | |
| parent | dffeb12f3dcb339bc258a7fbc38bbf9ec8dd928e (diff) | |
| download | samba-f4092ecec722d7e2c04f3049630975af9e96bc07.tar.gz samba-f4092ecec722d7e2c04f3049630975af9e96bc07.tar.bz2 samba-f4092ecec722d7e2c04f3049630975af9e96bc07.zip | |
Plumb the SMB2 front end into the blocking lock backend.
Metze, you'll probably be happier with this work as it
doesn't abuse tevent in the way you dislike. This is a
first cut at the code, which will need lots of testing
but I'm hoping this will give people an idea of where I'm
going with this.
Jeremy.
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/locking.h | 7 | ||||
| -rw-r--r-- | source3/include/proto.h | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/source3/include/locking.h b/source3/include/locking.h index 1833ba3f80..ee59cad643 100644 --- a/source3/include/locking.h +++ b/source3/include/locking.h @@ -96,4 +96,11 @@ struct blocking_lock_record { void *blr_private; /* Implementation specific. */ }; +struct smbd_lock_element { + uint32_t smbpid; + enum brl_type brltype; + uint64_t offset; + uint64_t count; +}; + #endif /* _LOCKING_H_ */ diff --git a/source3/include/proto.h b/source3/include/proto.h index 929d1ecb32..dabfa15257 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -6101,6 +6101,12 @@ void smbd_aio_complete_mid(uint64_t mid); /* The following definitions come from smbd/blocking.c */ +void brl_timeout_fn(struct event_context *event_ctx, + struct timed_event *te, + struct timeval now, + void *private_data); +struct timeval timeval_brl_min(const struct timeval *tv1, + const struct timeval *tv2); void process_blocking_lock_queue(void); bool push_blocking_lock_request( struct byte_range_lock *br_lck, struct smb_request *req, |