svn commit: r328995 - head/usr.bin/sort

[Mark Johnston]

Author: markj
Date: Wed Feb  7 20:36:37 2018
New Revision: 328995
URL: https://svnweb.freebsd.org/changeset/base/328995

Log:
  Fix the WITH_SORT_THREADS build.
  
  PR:		201664
  MFC after:	1 week

Modified:
  head/usr.bin/sort/radixsort.c

Modified: head/usr.bin/sort/radixsort.c
==============================================================================
--- head/usr.bin/sort/radixsort.c	Wed Feb  7 20:13:08 2018	(r328994)
+++ head/usr.bin/sort/radixsort.c	Wed Feb  7 20:36:37 2018	(r328995)
@@ -129,6 +129,14 @@ have_sort_left(void)
 
 #endif /* SORT_THREADS */
 
+static void
+_push_ls(struct level_stack *ls)
+{
+
+	ls->next = g_ls;
+	g_ls = ls;
+}
+
 /*
  * Push sort level to the stack
  */
@@ -141,22 +149,14 @@ push_ls(struct sort_level *sl)
 	new_ls->sl = sl;
 
 #if defined(SORT_THREADS)
-	if (nthreads > 1)
+	if (nthreads > 1) {
 		pthread_mutex_lock(&g_ls_mutex);
-#endif
-
-	new_ls->next = g_ls;
-	g_ls = new_ls;
-
-#if defined(SORT_THREADS)
-	if (nthreads > 1)
+		_push_ls(new_ls);
 		pthread_cond_signal(&g_ls_cond);
-#endif
-
-#if defined(SORT_THREADS)
-	if (nthreads > 1)
 		pthread_mutex_unlock(&g_ls_mutex);
+	} else
 #endif
+		_push_ls(new_ls);
 }
 
 /*