Drop unused first argument from arena_get2

The arena pointer in the first argument to arena_get2 was used in the
old days before per-thread arenas.  They're unused now and hence can
be dropped.

ChangeLog:

	* malloc/arena.c (arena_get2): Drop unused argument.
	(arena_lock): Adjust.
	(arena_get_retry): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2797de49cf7c347db6af6cf2f1000d1e6085240b..1b5b03e666e5a9385957bb092f2581993f3d6933 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-24  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+       * malloc/arena.c (arena_get2): Drop unused argument.
+       (arena_lock): Adjust.
+       (arena_get_retry): Likewise.
+
 2015-08-24  Andreas Schwab  <schwab@suse.de>
 
        * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_IPC64):

diff --git a/malloc/arena.c b/malloc/arena.c
index 21ecc5a13791e1156996448f53a3074f8805c87a..cfec94d182d3efd72f24b19cc2ace6e2fbed5d75 100644 (file)
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -102,7 +102,7 @@ int __malloc_initialized = -1;
       if (ptr && !arena_is_corrupt (ptr))                                    \
         (void) mutex_lock (&ptr->mutex);                                     \
       else                                                                   \
-        ptr = arena_get2 (ptr, (size), NULL);                                \
+        ptr = arena_get2 ((size), NULL);                                     \
   } while (0)
 
 /* find the heap and corresponding arena for a given ptr */
@@ -849,7 +849,7 @@ out:
 
 static mstate
 internal_function
-arena_get2 (mstate a_tsd, size_t size, mstate avoid_arena)
+arena_get2 (size_t size, mstate avoid_arena)
 {
   mstate a;
 
@@ -914,10 +914,8 @@ arena_get_retry (mstate ar_ptr, size_t bytes)
     }
   else
     {
-      /* Grab ar_ptr->next prior to releasing its lock.  */
-      mstate prev = ar_ptr->next ? ar_ptr : 0;
       (void) mutex_unlock (&ar_ptr->mutex);
-      ar_ptr = arena_get2 (prev, bytes, ar_ptr);
+      ar_ptr = arena_get2 (bytes, ar_ptr);
     }
 
   return ar_ptr;