From patchwork Thu Jun  5 21:40:16 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Siddhesh Poyarekar <siddhesh@redhat.com>
X-Patchwork-Id: 1341
Received: (qmail 7215 invoked by alias); 5 Jun 2014 21:39:04 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 7204 invoked by uid 89); 5 Jun 2014 21:39:03 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL, BAYES_00,
	RP_MATCHES_RCVD, SPF_HELO_PASS,
	SPF_PASS autolearn=ham version=3.3.2
X-HELO: mx1.redhat.com
Date: Fri, 6 Jun 2014 03:10:16 +0530
From: Siddhesh Poyarekar <siddhesh@redhat.com>
To: Roland McGrath <roland@hack.frob.com>
Cc: Konstantin Serebryany <konstantin.s.serebryany@gmail.com>,
	GNU C Library <libc-alpha@sourceware.org>
Subject: Re: [PATCH] remove one nested function from nptl/allocatestack.c
Message-ID: <20140605214016.GG9145@spoyarek.pnq.redhat.com>
References: 
 <CAGQ9bdw9_bgxZ3UOMNnnMC7EXtyUbBs5AkHvEF3jT0uB3GhaSg@mail.gmail.com>
	<20140604171623.362652C39B4@topped-with-meat.com>
	<20140605090455.GB9145@spoyarek.pnq.redhat.com>
	<20140605183110.1B52C2C39B5@topped-with-meat.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20140605183110.1B52C2C39B5@topped-with-meat.com>
User-Agent: Mutt/1.5.22.1-rc1 (2013-10-16)

I have pushed this now.

Thanks,
Siddhesh

commit fc75bf464d128f6a722d6cca7012c996f1f73425
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date:   Fri Jun 6 02:59:49 2014 +0530

    Inline nested function check_list

diff --git a/ChangeLog b/ChangeLog
index 17f0c83..8fe1ad0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-05  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* nptl/allocatestack.c (check_list): Inlined function...
+	(__reclaim_stacks): ... here.
+
 2014-06-05  Ondřej Bílka  <neleai@seznam.cz>
 
 	[BZ #15698]
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 1e22f7d..d0d155c 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -830,26 +830,23 @@ __reclaim_stacks (void)
 
       if (add_p)
 	{
-	  /* We always add at the beginning of the list.  So in this
-	     case we only need to check the beginning of these lists.  */
-	  int check_list (list_t *l)
-	  {
-	    if (l->next->prev != l)
-	      {
-		assert (l->next->prev == elem);
-
-		elem->next = l->next;
-		elem->prev = l;
-		l->next = elem;
-
-		return 1;
-	      }
-
-	    return 0;
-	  }
-
-	  if (check_list (&stack_used) == 0)
-	    (void) check_list (&stack_cache);
+	  /* We always add at the beginning of the list.  So in this case we
+	     only need to check the beginning of these lists to see if the
+	     pointers at the head of the list are inconsistent.  */
+	  list_t *l = NULL;
+
+	  if (stack_used.next->prev != &stack_used)
+	    l = &stack_used;
+	  else if (stack_cache.next->prev != &stack_cache)
+	    l = &stack_cache;
+
+	  if (l != NULL)
+	    {
+	      assert (l->next->prev == elem);
+	      elem->next = l->next;
+	      elem->prev = l;
+	      l->next = elem;
+	    }
 	}
       else
 	{