From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 9 Jul 2009 08:54:23 +0000 (+0200)
Subject: Revert "TODO: talloc: talloc_free() should remove the reference to the current owner"
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=a257d8633bc633e8cb309c246c695a22e573f585

Revert "TODO: talloc: talloc_free() should remove the reference to the current owner"

This reverts commit 1901ff9942837e9cad22269b16b33a6af3df92a9.
---

diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index 1a316d6d58de..33cbfd7d268d 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -510,13 +510,9 @@ static inline int _talloc_free(void *ptr)
 		 * pointer.
 		 */
 		is_child = talloc_is_parent(tc->refs, ptr);
+		_talloc_free(tc->refs);
 		if (is_child) {
-			_talloc_free(tc->refs);
 			return _talloc_free(ptr);
-		} else {
-			/* the first reference becomes the owner */
-			_talloc_steal(talloc_parent(tc->refs), ptr);
-			_talloc_free(tc->refs);
 		}
 		return -1;
 	}