From 3a8b9b1fd95b1bb9b3dc00f6798eeb40d5100b7b Mon Sep 17 00:00:00 2001
From: Jason Evans <je@fb.com>
Date: Wed, 8 Oct 2014 00:54:16 -0700
Subject: [PATCH] Fix a recursive lock acquisition regression.

Fix a recursive lock acquisition regression, which was introduced by
8bb3198f72fc7587dc93527f9f19fb5be52fa553 (Refactor/fix arenas
manipulation.).
---
 src/jemalloc.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/jemalloc.c b/src/jemalloc.c
index 38b5aaf7..c62d8ce6 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -244,13 +244,11 @@ a0free(void *ptr)
 }
 
 /* Create a new arena and insert it into the arenas array at index ind. */
-arena_t *
-arena_init(unsigned ind)
+static arena_t *
+arena_init_locked(unsigned ind)
 {
 	arena_t *arena;
 
-	malloc_mutex_lock(&arenas_lock);
-
 	/* Expand arenas if necessary. */
 	assert(ind <= narenas_total);
 	if (ind == narenas_total) {
@@ -258,10 +256,8 @@ arena_init(unsigned ind)
 		arena_t **arenas_new =
 		    (arena_t **)a0malloc(CACHELINE_CEILING(narenas_new *
 		    sizeof(arena_t *)));
-		if (arenas_new == NULL) {
-			arena = NULL;
-			goto label_return;
-		}
+		if (arenas_new == NULL)
+			return (NULL);
 		memcpy(arenas_new, arenas, narenas_total * sizeof(arena_t *));
 		arenas_new[ind] = NULL;
 		/*
@@ -281,12 +277,21 @@ arena_init(unsigned ind)
 	arena = arenas[ind];
 	if (arena != NULL) {
 		assert(ind < narenas_auto);
-		goto label_return;
+		return (arena);
 	}
 
 	/* Actually initialize the arena. */
 	arena = arenas[ind] = arena_new(ind);
-label_return:
+	return (arena);
+}
+
+arena_t *
+arena_init(unsigned ind)
+{
+	arena_t *arena;
+
+	malloc_mutex_lock(&arenas_lock);
+	arena = arena_init_locked(ind);
 	malloc_mutex_unlock(&arenas_lock);
 	return (arena);
 }
@@ -477,7 +482,7 @@ arena_choose_hard(tsd_t *tsd)
 		} else {
 			/* Initialize a new arena. */
 			choose = first_null;
-			ret = arena_init(choose);
+			ret = arena_init_locked(choose);
 			if (ret == NULL) {
 				malloc_mutex_unlock(&arenas_lock);
 				return (NULL);