diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/files.c | 3 | ||||
| -rw-r--r-- | source3/smbd/oplock.c | 10 |
2 files changed, 7 insertions, 6 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--; diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index ddb05d8b92..39fc847d6f 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -152,6 +152,8 @@ void release_file_oplock(files_struct *fsp) fsp->sent_oplock_break = NO_BREAK_SENT; flush_write_cache(fsp, OPLOCK_RELEASE_FLUSH); + + TALLOC_FREE(fsp->oplock_timeout); } /**************************************************************************** @@ -341,12 +343,8 @@ static void oplock_timeout_handler(struct event_context *ctx, { files_struct *fsp = (files_struct *)private_data; - /* Ensure we always remove this event. */ - if (fsp->oplock_timeout != NULL) { - /* Remove the timed event handler. */ - TALLOC_FREE(fsp->oplock_timeout); - fsp->oplock_timeout = NULL; - } + /* Remove the timed event handler. */ + TALLOC_FREE(fsp->oplock_timeout); DEBUG(0, ("Oplock break failed for file %s -- replying anyway\n", fsp->fsp_name)); global_client_failed_oplock_break = True; remove_oplock(fsp); |