From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 4 May 2006 18:08:28 +0000 (+0000)
Subject: * sunrpc/rpc_thread.c (__rpc_thread_destroy): Don't skip entire
X-Git-Tag: upstream/2.20~8555
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca4fce0e1ece616c6f34d549469d26d787141a89;p=platform%2Fupstream%2Flinaro-glibc.git

* sunrpc/rpc_thread.c (__rpc_thread_destroy): Don't skip entire

	cleanup for initial thread, just the free call on TVP.
---

diff --git a/ChangeLog b/ChangeLog
index ad0fee6..24546f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-04  Ulrich Drepper  <drepper@redhat.com>
 
+	* sunrpc/rpc_thread.c (__rpc_thread_destroy): Don't skip entire
+	cleanup for initial thread, just the free call on TVP.
+
 	* nscd/gai.c (__getline): Define.
 
 
diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c
index fbc1cf7..91e94c2 100644
--- a/sunrpc/rpc_thread.c
+++ b/sunrpc/rpc_thread.c
@@ -20,7 +20,7 @@ __rpc_thread_destroy (void)
 {
 	struct rpc_thread_variables *tvp = __libc_tsd_get (RPC_VARS);
 
-	if (tvp != NULL && tvp != &__libc_tsd_RPC_VARS_mem) {
+	if (tvp != NULL) {
 		__rpc_thread_svc_cleanup ();
 		__rpc_thread_clnt_cleanup ();
 		__rpc_thread_key_cleanup ();
@@ -29,7 +29,8 @@ __rpc_thread_destroy (void)
 		free (tvp->svcraw_private_s);
 		free (tvp->authdes_cache_s);
 		free (tvp->authdes_lru_s);
-		free (tvp);
+		if (tvp != &__libc_tsd_RPC_VARS_mem)
+			free (tvp);
 		__libc_tsd_set (RPC_VARS, NULL);
 	}
 }