From eea0f7da7151dc9b6a51ca293c6c3364d1363ad2 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Fri, 7 Nov 2014 15:03:17 -0800
Subject: [PATCH] Revert "Reverse lock order"

This reverts commit a7ad186e0f2b643c4e2bf302bc18e892d499cd4a.
---
 src/slurmd/slurmd/slurmd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index f9ed4b1ed83..57d0bde1f33 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -751,9 +751,11 @@ _read_config(void)
 #ifndef HAVE_FRONT_END
 	bool cr_flag = false, gang_flag = false;
 #endif
-	slurm_mutex_lock(&conf->config_mutex);
+
 	cf = slurm_conf_lock();
 
+	slurm_mutex_lock(&conf->config_mutex);
+
 	if (conf->conffile == NULL)
 		conf->conffile = xstrdup(cf->slurm_conf);
 
-- 
GitLab