From a955a1199708646a411780e0c9dc1883a6d5feca Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 24 Aug 2017 08:20:13 -0600
Subject: [PATCH] Cosmetic changes. No changes in logic
---
src/plugins/mpi/pmi2/kvs.c | 4 ++--
src/plugins/mpi/pmi2/tree.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/mpi/pmi2/kvs.c b/src/plugins/mpi/pmi2/kvs.c
index 1a99324d4b5..85e0244f1b3 100644
--- a/src/plugins/mpi/pmi2/kvs.c
+++ b/src/plugins/mpi/pmi2/kvs.c
@@ -116,9 +116,9 @@ temp_kvs_init(void)
/* XXX: TBC */
num_children = tree_info.num_children + 1;
- pack32((uint32_t)nodeid, buf); /* from_nodeid */
+ pack32(nodeid, buf); /* from_nodeid */
packstr(tree_info.this_node, buf); /* from_node */
- pack32((uint32_t)num_children, buf); /* num_children */
+ pack32(num_children, buf); /* num_children */
pack32(kvs_seq, buf);
} else {
pack32(kvs_seq, buf);
diff --git a/src/plugins/mpi/pmi2/tree.c b/src/plugins/mpi/pmi2/tree.c
index 30ad957c907..0e140aab42f 100644
--- a/src/plugins/mpi/pmi2/tree.c
+++ b/src/plugins/mpi/pmi2/tree.c
@@ -135,7 +135,7 @@ _handle_kvs_fence(int fd, Buf buf)
temp_kvs_merge(buf);
- if (children_to_wait == 0 && tasks_to_wait == 0) {
+ if ((children_to_wait == 0) && (tasks_to_wait == 0)) {
rc = temp_kvs_send();
if (rc != SLURM_SUCCESS) {
if (in_stepd()) {
@@ -179,13 +179,13 @@ _handle_kvs_fence_resp(int fd, Buf buf)
debug3("mpi/pmi2: in _handle_kvs_fence_resp");
safe_unpack32(&seq, buf);
- if( seq == kvs_seq - 2) {
+ if (seq == kvs_seq - 2) {
debug("mpi/pmi2: duplicate KVS_FENCE_RESP "
"seq %d kvs_seq %d from srun ignored", seq, kvs_seq);
return rc;
} else if (seq != kvs_seq - 1) {
- error("mpi/pmi2: invalid kvs seq from srun, expect %u"
- " got %u", kvs_seq - 1, seq);
+ error("mpi/pmi2: invalid kvs seq from srun, expect %u got %u",
+ kvs_seq - 1, seq);
rc = SLURM_ERROR;;
errmsg = "mpi/pmi2: invalid kvs seq from srun";
goto resp;
--
GitLab