Skip to content
Snippets Groups Projects
Commit 9f4c2b7a authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Replace slurm_conf_lock() with direct reference to slurmctld_conf.

Still use the conf pointer, rather than rewriting the following lines,
but set it directly to &slurmctld_conf.
parent e205eeaf
No related branches found
No related tags found
No related merge requests found
...@@ -641,7 +641,7 @@ static void _throttle_fini(int *active_rpc_cnt) ...@@ -641,7 +641,7 @@ static void _throttle_fini(int *active_rpc_cnt)
*/ */
static void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr) static void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr)
{ {
slurm_ctl_conf_t *conf; slurm_ctl_conf_t *conf = &slurmctld_conf;
char *licenses_used; char *licenses_used;
uint32_t next_job_id; uint32_t next_job_id;
...@@ -650,8 +650,6 @@ static void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr) ...@@ -650,8 +650,6 @@ static void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr)
next_job_id = get_next_job_id(true); next_job_id = get_next_job_id(true);
conf = slurm_conf_lock();
memset(conf_ptr, 0, sizeof(slurm_ctl_conf_t)); memset(conf_ptr, 0, sizeof(slurm_ctl_conf_t));
conf_ptr->last_update = time(NULL); conf_ptr->last_update = time(NULL);
...@@ -904,9 +902,6 @@ static void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr) ...@@ -904,9 +902,6 @@ static void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr)
conf_ptr->unkillable_timeout = conf->unkillable_timeout; conf_ptr->unkillable_timeout = conf->unkillable_timeout;
conf_ptr->version = xstrdup(SLURM_VERSION_STRING); conf_ptr->version = xstrdup(SLURM_VERSION_STRING);
conf_ptr->vsize_factor = conf->vsize_factor; conf_ptr->vsize_factor = conf->vsize_factor;
slurm_conf_unlock();
return;
} }
/* /*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment