Skip to content
Snippets Groups Projects
Commit 3f64a484 authored by Danny Auble's avatar Danny Auble
Browse files

Merge remote-tracking branch 'origin/slurm-16.05'

parents da3c8141 774a2b88
No related branches found
No related tags found
No related merge requests found
...@@ -237,6 +237,7 @@ documents those changes that are of interest to users and administrators. ...@@ -237,6 +237,7 @@ documents those changes that are of interest to users and administrators.
TopologyParam options No*InAddrAny. TopologyParam options No*InAddrAny.
-- Cray - Better robustness when dealing with the aeld interface. -- Cray - Better robustness when dealing with the aeld interface.
-- job_submit.lua - add array_inx value for job arrays. -- job_submit.lua - add array_inx value for job arrays.
-- Perlapi - Remove unneeded/undefined mutex.
* Changes in Slurm 15.08.11 * Changes in Slurm 15.08.11
=========================== ===========================
......
...@@ -38,7 +38,6 @@ static uint32_t _threads_per_core(char *host) ...@@ -38,7 +38,6 @@ static uint32_t _threads_per_core(char *host)
if (!job_node_ptr || !host) if (!job_node_ptr || !host)
return threads; return threads;
slurm_mutex_lock(&job_node_info_lock);
for (i = 0; i < job_node_ptr->record_count; i++) { for (i = 0; i < job_node_ptr->record_count; i++) {
if (job_node_ptr->node_array[i].name && if (job_node_ptr->node_array[i].name &&
!strcmp(host, job_node_ptr->node_array[i].name)) { !strcmp(host, job_node_ptr->node_array[i].name)) {
...@@ -46,7 +45,7 @@ static uint32_t _threads_per_core(char *host) ...@@ -46,7 +45,7 @@ static uint32_t _threads_per_core(char *host)
break; break;
} }
} }
slurm_mutex_unlock(&job_node_info_lock);
return threads; return threads;
} }
......
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