summaryrefslogtreecommitdiffstats
path: root/source/smbd/files.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-06-22 17:19:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:33 -0500
commit6de0970704b3eff2b71e6bf499c6dda45d4d5e2d (patch)
tree1fc9f30a38e6375b40fbed9bede4399ac09c9a14 /source/smbd/files.c
parent277e07c8553e2ed20bc95493cdc996be43feb6bd (diff)
downloadsamba-6de0970704b3eff2b71e6bf499c6dda45d4d5e2d.tar.gz
samba-6de0970704b3eff2b71e6bf499c6dda45d4d5e2d.tar.xz
samba-6de0970704b3eff2b71e6bf499c6dda45d4d5e2d.zip
r23589: Ensure we will always release any timeout handler
on fsp close or removal of oplock. Mulitple removals are safe. Jeremy.
Diffstat (limited to 'source/smbd/files.c')
-rw-r--r--source/smbd/files.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/smbd/files.c b/source/smbd/files.c
index 590916011b0..9994b50d15a 100644
--- a/source/smbd/files.c
+++ b/source/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--;