diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-01-17 12:59:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:13 -0500 |
| commit | bf219447a35d86913c1a643b66d993986a651360 (patch) | |
| tree | abd6650e6694233de6d6f8e197a03b513ecaec56 /source3/smbd/oplock.c | |
| parent | 60c1a8e5a8f905a5ae703dac05ed2f440875ad5d (diff) | |
| download | samba-bf219447a35d86913c1a643b66d993986a651360.tar.gz samba-bf219447a35d86913c1a643b66d993986a651360.tar.bz2 samba-bf219447a35d86913c1a643b66d993986a651360.zip | |
r20846: Before this gets out of control...
This add a struct event_context and infrastructure for fd events to smbd. This
is step zero to import lib/events.
Jeremy, I rely on you to watch the change in receive_message_or_smb()
closely. For the normal code path this should be the only relevant change. The
rest is either not yet used or is cosmetic.
Volker
(This used to be commit cd07f93a8aecb24c056e33b1ad3447a41959810f)
Diffstat (limited to 'source3/smbd/oplock.c')
| -rw-r--r-- | source3/smbd/oplock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 427fb7f245..1f73ea837d 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -342,7 +342,8 @@ static files_struct *initial_break_processing(SMB_DEV_T dev, SMB_INO_T inode, un return fsp; } -static void oplock_timeout_handler(struct timed_event *te, +static void oplock_timeout_handler(struct event_context *ctx, + struct timed_event *te, const struct timeval *now, void *private_data) { @@ -372,7 +373,7 @@ static void add_oplock_timeout_handler(files_struct *fsp) } fsp->oplock_timeout = - add_timed_event(NULL, + event_add_timed(smbd_event_context(), NULL, timeval_current_ofs(OPLOCK_BREAK_TIMEOUT, 0), "oplock_timeout_handler", oplock_timeout_handler, fsp); |