From d60f0cbd8850ab8e4ee4a463872ae4c36031c2f7 Mon Sep 17 00:00:00 2001
From: Gilles Gouaillardet <gilles.gouaillardet@iferc.org>
Date: Tue, 21 Oct 2014 10:42:22 +0900
Subject: [PATCH] btl/vader: report an error when a segment cannot be attached

---
 opal/mca/btl/vader/btl_vader_module.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/opal/mca/btl/vader/btl_vader_module.c b/opal/mca/btl/vader/btl_vader_module.c
index c3653b0c3d..2e7f738d83 100644
--- a/opal/mca/btl/vader/btl_vader_module.c
+++ b/opal/mca/btl/vader/btl_vader_module.c
@@ -15,6 +15,8 @@
  * Copyright (c) 2010-2014 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * Copyright (c) 2014      Intel, Inc. All rights reserved.
+ * Copyright (c) 2014      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -208,7 +210,7 @@ static int init_vader_endpoint (struct mca_btl_base_endpoint_t *ep, struct opal_
 
             ep->segment_base = opal_shmem_segment_attach (ep->segment_data.other.seg_ds);
             if (NULL == ep->segment_base) {
-                return rc;
+                return OPAL_ERROR;
             }
 #if OPAL_BTL_VADER_HAVE_XPMEM
         }