From 5e109fba6a3210b463ddaf3a5a9da739559710fc Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Wed, 29 Nov 2017 03:30:40 -0800
Subject: [PATCH] Take the smallest change approach to fixing the hang on
 disconnect of connect/accept operations by replacing the call to
 pmix.disconnect with a simple pmix.fence as this is all OMPI currently
 requires

Signed-off-by: Ralph Castain <rhc@open-mpi.org>
---
 ompi/dpm/dpm.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/ompi/dpm/dpm.c b/ompi/dpm/dpm.c
index 647ec4e15b..dfc7efc747 100644
--- a/ompi/dpm/dpm.c
+++ b/ompi/dpm/dpm.c
@@ -588,13 +588,8 @@ int ompi_dpm_disconnect(ompi_communicator_t *comm)
     }
 
     /* ensure we tell the host RM to disconnect us - this
-     * is a blocking operation that must include a fence */
-    if (NULL == opal_pmix.disconnect) {
-        /* use the fence */
-        ret = opal_pmix.fence(&coll, false);
-    } else {
-        ret = opal_pmix.disconnect(&coll);
-    }
+     * is a blocking operation so just use a fence */
+    ret = opal_pmix.fence(&coll, false);
     OPAL_LIST_DESTRUCT(&coll);
 
     return ret;