From: Volker Lendecke <vl@samba.org>
Date: Thu, 26 Apr 2012 16:57:01 +0000 (+0200)
Subject: s3: oplock_timeout is a talloc child of fsp
X-Git-Tag: samba-4.0.0alpha20~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54a6d7b3b81782bba504e50905a2d0b437b0cae1;p=thirdparty%2Fsamba.git

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@samba.org>
Autobuild-Date: Thu Apr 26 23:00:03 CEST 2012 on sn-devel-104
---

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index edcd98cd85e..8a9f0555308 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -453,9 +453,6 @@ void file_free(struct smb_request *req, files_struct *fsp)
 		TALLOC_FREE(fsp->notify);
 	}
 
-	/* Ensure this event will never fire. */
-	TALLOC_FREE(fsp->oplock_timeout);
-
 	/* Ensure this event will never fire. */
 	TALLOC_FREE(fsp->update_write_time_event);