From: Volker Lendecke <vl@samba.org>
Date: Thu, 26 Apr 2012 16:54:37 +0000 (+0200)
Subject: s3: Remove code TALLOC_FREE already does
X-Git-Tag: samba-4.0.0alpha20~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21985a7f10d5bea6d80b3063c238f2c38b96e76d;p=thirdparty%2Fsamba.git

s3: Remove code TALLOC_FREE already does
---

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index b181fb79ba0..173c53e2ec0 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;
 }