From edd23ef235c211df931daee8caa3973ad053c784 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 12 Oct 2006 15:34:26 +0000
Subject: [PATCH] svn merge -r9728:9730 https://eris.llnl.gov/svn/slurm/branche
s/slurm-1.1
---
.../select/bluegene/block_allocator/block_allocator.c | 5 ++++-
src/slurmctld/node_scheduler.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.c b/src/plugins/select/bluegene/block_allocator/block_allocator.c
index 58659296119..8dc26c2d7b5 100644
--- a/src/plugins/select/bluegene/block_allocator/block_allocator.c
+++ b/src/plugins/select/bluegene/block_allocator/block_allocator.c
@@ -1036,8 +1036,11 @@ extern void set_node_list(List nodes)
itr = list_iterator_create(nodes);
while ((ba_node = list_next(itr))) {
curr_ba_node = &ba_system_ptr->grid[ba_node->coord[X]]
+#ifdef HAVE_BG
[ba_node->coord[Y]]
- [ba_node->coord[Z]];
+ [ba_node->coord[Z]]
+#endif
+ ;
memcpy(curr_ba_node, ba_node, sizeof(ba_node_t));
}
list_iterator_destroy(itr);
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 0235c0efb12..73982d420cf 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -1415,7 +1415,10 @@ extern void build_node_details(struct job_record *job_ptr)
error("Invalid node %s in JobId=%u",
this_node_name, job_ptr->job_id);
}
- cleanup: free(this_node_name);
+#ifdef HAVE_BG
+ cleanup:
+#endif
+ free(this_node_name);
}
hostlist_destroy(host_list);
if (job_ptr->node_cnt != node_inx) {
--
GitLab