[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  54a6d7b s3: oplock_timeout is a talloc child of fsp
       via  21985a7 s3: Remove code TALLOC_FREE already does
      from  307e2d1 torture: change dfs tests now that we return a level 4 when level 4 is requested

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 54a6d7b3b81782bba504e50905a2d0b437b0cae1
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Apr 26 18:57:01 2012 +0200

    s3: oplock_timeout is a talloc child of fsp
    
    Jeremy, I know you like it explicit, but I stumbled across this
    explicit TALLOC_FREE and asked myself about a potentially wrong
    talloc hierarchy.
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Thu Apr 26 23:00:03 CEST 2012 on sn-devel-104

commit 21985a7f10d5bea6d80b3063c238f2c38b96e76d
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Apr 26 18:54:37 2012 +0200

    s3: Remove code TALLOC_FREE already does

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/files.c  |    3 ---
 source3/smbd/oplock.c |    6 +-----
 2 files changed, 1 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index edcd98c..8a9f055 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -454,9 +454,6 @@ void file_free(struct smb_request *req, files_struct *fsp)
 	}
 
 	/* Ensure this event will never fire. */
-	TALLOC_FREE(fsp->oplock_timeout);
-
-	/* Ensure this event will never fire. */
 	TALLOC_FREE(fsp->update_write_time_event);
 
 	bitmap_clear(sconn->file_bmap, fsp->fnum - FILE_HANDLE_OFFSET);
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index b181fb7..173c53e 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -668,11 +668,7 @@ void reply_to_oplock_break_requests(files_struct *fsp)
 
 	SAFE_FREE(fsp->pending_break_messages);
 	fsp->num_pending_break_messages = 0;
-	if (fsp->oplock_timeout != NULL) {
-		/* Remove the timed event handler. */
-		TALLOC_FREE(fsp->oplock_timeout);
-		fsp->oplock_timeout = NULL;
-	}
+	TALLOC_FREE(fsp->oplock_timeout);
 	return;
 }
 


-- 
Samba Shared Repository