diff options
| author | Volker Lendecke <vl@samba.org> | 2013-09-04 13:57:00 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-02-14 20:12:37 +0100 |
| commit | 4ce9501d4d4aed8db3a666b77b556b97f8693014 (patch) | |
| tree | dba420cda6de634e37edbc005cc938621497d5ae /source3/smbd | |
| parent | b5253bf2dc1c9729551f8b4adc5fe77dcc922bb0 (diff) | |
| download | samba-4ce9501d4d4aed8db3a666b77b556b97f8693014.tar.gz | |
smbd: Fix an ancient oplock bug
If we get an oplock break response, we forgot to remove the oplock break
timeout.
Found by stopping raw.oplock.exclusive5 after the 2nd open and watching a debug
level 10 log. This amends 08a9de89 from 2007.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 0670975261c5f29394f9e9d25f899a7de948dad1)
Fix bug #10436 - cancel fsp->oplock_timeout in downgrade_file_oplock().
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/oplock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 05b0d0b7a4..f2d39b808a 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -150,6 +150,8 @@ static void downgrade_file_oplock(files_struct *fsp) sconn->oplocks.exclusive_open--; sconn->oplocks.level_II_open++; fsp->sent_oplock_break = NO_BREAK_SENT; + + TALLOC_FREE(fsp->oplock_timeout); } /**************************************************************************** |