summaryrefslogtreecommitdiff
path: root/source3/smbd/oplock.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-04-24 00:29:41 -0700
committerJeremy Allison <jra@samba.org>2010-04-24 00:29:41 -0700
commita796542a930dec93c2a747c4b015d8d650a081fd (patch)
tree62622992bf5d3599c12374de34768f7f1291a690 /source3/smbd/oplock.c
parent247273196ff8035ef16805f04fe7c32ef9a8be50 (diff)
downloadsamba-a796542a930dec93c2a747c4b015d8d650a081fd.tar.gz
samba-a796542a930dec93c2a747c4b015d8d650a081fd.tar.bz2
samba-a796542a930dec93c2a747c4b015d8d650a081fd.zip
Implement oplocks within SMB2. Plumb into the existing SMB1 oplock system.
Seems to work but needs more tests (to be added). Jeremy.
Diffstat (limited to 'source3/smbd/oplock.c')
-rw-r--r--source3/smbd/oplock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 2289787ddd..c22a589104 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -215,7 +215,7 @@ bool should_notify_deferred_opens()
****************************************************************************/
static char *new_break_message_smb1(TALLOC_CTX *mem_ctx,
- files_struct *fsp, uint8 cmd)
+ files_struct *fsp, int cmd)
{
char *result = TALLOC_ARRAY(mem_ctx, char, smb_size + 8*2 + 0);
@@ -345,7 +345,7 @@ static void add_oplock_timeout_handler(files_struct *fsp)
}
fsp->oplock_timeout =
- event_add_timed(smbd_event_context(), NULL,
+ event_add_timed(smbd_event_context(), fsp,
timeval_current_ofs(OPLOCK_BREAK_TIMEOUT, 0),
oplock_timeout_handler, fsp);
@@ -354,7 +354,7 @@ static void add_oplock_timeout_handler(files_struct *fsp)
}
}
-static void send_break_message_smb1(files_struct *fsp, uint8_t level)
+static void send_break_message_smb1(files_struct *fsp, int level)
{
char *break_msg = new_break_message_smb1(talloc_tos(),
fsp,