From 08a9de8927bbca982be4e566e56748045defc1c7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 22 Jun 2007 17:19:08 +0000 Subject: 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) --- source3/smbd/files.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/smbd/files.c') 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--; -- cgit