Merge pull request #6526 from ggouaillardet/topic/vader_fini

btl/vader: fix finalize sequence

opal/mca/btl/vader/btl_vader_component.c

@@ -16,8 +16,8 @@
  *                         All rights reserved.
  * Copyright (c) 2011      NVIDIA Corporation.  All rights reserved.
  * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
- * Copyright (c) 2014-2018 Research Organization for Information Science
+ * Copyright (c) 2014-2019 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
  * Copyright (c) 2018      Triad National Security, LLC. All rights
  *                         reserved.
@@ -342,6 +342,11 @@ static int mca_btl_vader_component_close(void)
     mca_btl_vader_knem_fini ();
 #endif
 
+    if (mca_btl_vader_component.mpool) {
+        mca_btl_vader_component.mpool->mpool_finalize (mca_btl_vader_component.mpool);
+        mca_btl_vader_component.mpool = NULL;
+    }
+
     return OPAL_SUCCESS;
 }
 

opal/mca/btl/vader/btl_vader_module.c

@@ -15,8 +15,8 @@
  * Copyright (c) 2010-2015 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
- * Copyright (c) 2014-2015 Research Organization for Information Science
+ * Copyright (c) 2014-2019 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2018-2019 Triad National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
@@ -380,11 +380,6 @@ static int vader_finalize(struct mca_btl_base_module_t *btl)
     }
 #endif
 
-    if (component->mpool) {
-        component->mpool->mpool_finalize (component->mpool);
-        component->mpool = NULL;
-    }
-
     return OPAL_SUCCESS;
 }