btl/vader: report an error when a segment cannot be attached

ggouaillardet · ggouaillardet · commit d60f0cbd8850 · 2014-10-21T10:42:22.000+09:00
diff --git 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
         }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`* Copyright (c) 2010-2014 Los Alamos National Security, LLC. All rights`
`16`	`16`	`* reserved.`
`17`	`17`	`* Copyright (c) 2014 Intel, Inc. All rights reserved.`
	`18`	`+ * Copyright (c) 2014 Research Organization for Information Science`
	`19`	`+ * and Technology (RIST). All rights reserved.`
`18`	`20`	`* $COPYRIGHT$`
`19`	`21`	`*`
`20`	`22`	`* Additional copyrights may follow`
`@@ -208,7 +210,7 @@ static int init_vader_endpoint (struct mca_btl_base_endpoint_t *ep, struct opal_`
`208`	`210`
`209`	`211`	`ep->segment_base = opal_shmem_segment_attach (ep->segment_data.other.seg_ds);`
`210`	`212`	`if (NULL == ep->segment_base) {`
`211`		`- return rc;`
	`213`	`+ return OPAL_ERROR;`
`212`	`214`	`}`
`213`	`215`	`#if OPAL_BTL_VADER_HAVE_XPMEM`
`214`	`216`	`}`