From fb5362c069b5b6548478b2217a0519c56d856705 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 20 Feb 2006 17:59:58 +0000 Subject: r13571: Replace all calls to talloc_free() with thye TALLOC_FREE() macro which sets the freed pointer to NULL. (This used to be commit b65be8874a2efe5a4b167448960a4fcf6bd995e2) --- source3/smbd/oplock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/smbd/oplock.c') diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 3efd630649..7d0a94efda 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -197,7 +197,7 @@ BOOL remove_oplock(files_struct *fsp) (double)inode)); } release_file_oplock(fsp); - talloc_free(lck); + TALLOC_FREE(lck); return ret; } @@ -226,7 +226,7 @@ BOOL downgrade_oplock(files_struct *fsp) } downgrade_file_oplock(fsp); - talloc_free(lck); + TALLOC_FREE(lck); return ret; } @@ -470,7 +470,7 @@ static void process_oplock_async_level2_break_message(int msg_type, struct proce /* Restore the sign state to what it was. */ srv_oplock_set_signing(sign_state); - talloc_free(break_msg); + TALLOC_FREE(break_msg); /* Async level2 request, don't send a reply, just remove the oplock. */ remove_oplock(fsp); @@ -578,7 +578,7 @@ static void process_oplock_break_message(int msg_type, struct process_id src, /* Restore the sign state to what it was. */ srv_oplock_set_signing(sign_state); - talloc_free(break_msg); + TALLOC_FREE(break_msg); fsp->sent_oplock_break = break_to_level2 ? LEVEL_II_BREAK_SENT:BREAK_TO_NONE_SENT; @@ -654,7 +654,7 @@ static void process_kernel_oplock_break(int msg_type, struct process_id src, /* Restore the sign state to what it was. */ srv_oplock_set_signing(sign_state); - talloc_free(break_msg); + TALLOC_FREE(break_msg); fsp->sent_oplock_break = BREAK_TO_NONE_SENT; @@ -681,7 +681,7 @@ void reply_to_oplock_break_requests(files_struct *fsp) fsp->num_pending_break_messages = 0; if (fsp->oplock_timeout != NULL) { /* Remove the timed event handler. */ - talloc_free(fsp->oplock_timeout); + TALLOC_FREE(fsp->oplock_timeout); fsp->oplock_timeout = NULL; } return; @@ -801,7 +801,7 @@ void release_level_2_oplocks_on_change(files_struct *fsp) DEBUG(0,("release_level_2_oplocks_on_change: PANIC. " "share mode entry %d is an exlusive " "oplock !\n", i )); - talloc_free(lck); + TALLOC_FREE(lck); abort(); } @@ -816,7 +816,7 @@ void release_level_2_oplocks_on_change(files_struct *fsp) /* We let the message receivers handle removing the oplock state in the share mode lock db. */ - talloc_free(lck); + TALLOC_FREE(lck); } /**************************************************************************** -- cgit