From d127b762594630e8524a92b43845266fd253dfeb Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Fri, 10 Feb 2017 13:45:23 -0700
Subject: [PATCH] Minor formatting changes to PMIX
---
src/plugins/mpi/pmix/pmixp_client.c | 4 ++--
src/plugins/mpi/pmix/pmixp_info.h | 2 +-
src/plugins/mpi/pmix/pmixp_utils.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/mpi/pmix/pmixp_client.c b/src/plugins/mpi/pmix/pmixp_client.c
index d78772d88ba..397cfb0fc92 100644
--- a/src/plugins/mpi/pmix/pmixp_client.c
+++ b/src/plugins/mpi/pmix/pmixp_client.c
@@ -223,13 +223,13 @@ int pmixp_libpmix_init(void)
pmix_info_t *kvp = NULL;
if (0 != (rc = pmixp_mkdir(pmixp_info_tmpdir_lib(), rights))) {
- PMIXP_ERROR_STD("Cannot create server tmpdir: \"%s\"",
+ PMIXP_ERROR_STD("Cannot create server lib tmpdir: \"%s\"",
pmixp_info_tmpdir_lib());
return errno;
}
if (0 != (rc = pmixp_mkdir(pmixp_info_tmpdir_cli(), rights))) {
- PMIXP_ERROR_STD("Cannot create client tmpdir: \"%s\"",
+ PMIXP_ERROR_STD("Cannot create client cli tmpdir: \"%s\"",
pmixp_info_tmpdir_cli());
return errno;
}
diff --git a/src/plugins/mpi/pmix/pmixp_info.h b/src/plugins/mpi/pmix/pmixp_info.h
index 803b8da9395..0b1fb17fb8e 100644
--- a/src/plugins/mpi/pmix/pmixp_info.h
+++ b/src/plugins/mpi/pmix/pmixp_info.h
@@ -105,7 +105,7 @@ static inline char *pmixp_info_tmpdir_cli_base(void)
return _pmixp_job_info.cli_tmpdir_base;
}
-/* Cli tempdir */
+/* Lib tempdir */
static inline char *pmixp_info_tmpdir_lib(void)
{
return _pmixp_job_info.lib_tmpdir;
diff --git a/src/plugins/mpi/pmix/pmixp_utils.c b/src/plugins/mpi/pmix/pmixp_utils.c
index 94ad445f9f8..43d5bb9bb9b 100644
--- a/src/plugins/mpi/pmix/pmixp_utils.c
+++ b/src/plugins/mpi/pmix/pmixp_utils.c
@@ -527,7 +527,7 @@ int pmixp_mkdir(char *path, mode_t rights)
if (0 != mkdir(path, rights) ) {
PMIXP_ERROR_STD("Cannot create directory \"%s\"",
- pmixp_info_tmpdir_lib());
+ path);
return errno;
}
@@ -540,7 +540,7 @@ int pmixp_mkdir(char *path, mode_t rights)
}
if (chown(path, (uid_t) pmixp_info_jobuid(), (gid_t) -1) < 0) {
- error("%s: chown(%s): %m", __func__, pmixp_info_tmpdir_lib());
+ error("%s: chown(%s): %m", __func__, path);
return errno;
}
return 0;
--
GitLab