diff options
| author | Jeremy Allison <jra@samba.org> | 2007-06-22 17:19:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:33 -0500 |
| commit | 08a9de8927bbca982be4e566e56748045defc1c7 (patch) | |
| tree | cfc00ff05a047dbe7209ab3c874a36b7526074c9 /source3/smbd/files.c | |
| parent | 32a3c30627fad859bc7fa218cc40e7b056bac30d (diff) | |
| download | samba-08a9de8927bbca982be4e566e56748045defc1c7.tar.gz samba-08a9de8927bbca982be4e566e56748045defc1c7.tar.bz2 samba-08a9de8927bbca982be4e566e56748045defc1c7.zip | |
r23589: Ensure we will always release any timeout handler
on fsp close or removal of oplock. Mulitple removals
are safe.
Jeremy.
(This used to be commit 6de0970704b3eff2b71e6bf499c6dda45d4d5e2d)
Diffstat (limited to 'source3/smbd/files.c')
| -rw-r--r-- | source3/smbd/files.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/smbd/files.c b/source3/smbd/files.c index 590916011b..9994b50d15 100644 --- a/source3/smbd/files.c +++ b/source3/smbd/files.c @@ -439,6 +439,9 @@ void file_free(files_struct *fsp) TALLOC_FREE(fsp->notify); } + /* Ensure this event will never fire. */ + TALLOC_FREE(fsp->oplock_timeout); + bitmap_clear(file_bmap, fsp->fnum - FILE_HANDLE_OFFSET); files_used--; |