svn commit: r457470 - in head/net/openmpi2: . files

[Danilo Egea Gondolfo]

Author: danilo
Date: Thu Dec 28 19:28:24 2017
New Revision: 457470
URL: https://svnweb.freebsd.org/changeset/ports/457470

Log:
  - Teach OpenMPI that posix_fallocate(2) returns EINVAL on most recent ZFS

Added:
  head/net/openmpi2/files/
  head/net/openmpi2/files/patch-opal_mca_pmix_pmix112_pmix_src_sm_pmix__mmap.c   (contents, props changed)
Modified:
  head/net/openmpi2/Makefile

Modified: head/net/openmpi2/Makefile
==============================================================================
--- head/net/openmpi2/Makefile	Thu Dec 28 19:21:21 2017	(r457469)
+++ head/net/openmpi2/Makefile	Thu Dec 28 19:28:24 2017	(r457470)
@@ -2,6 +2,7 @@
 
 PORTNAME=	openmpi
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 PKGNAMESUFFIX=	2

Added: head/net/openmpi2/files/patch-opal_mca_pmix_pmix112_pmix_src_sm_pmix__mmap.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/openmpi2/files/patch-opal_mca_pmix_pmix112_pmix_src_sm_pmix__mmap.c	Thu Dec 28 19:28:24 2017	(r457470)
@@ -0,0 +1,20 @@
+--- opal/mca/pmix/pmix112/pmix/src/sm/pmix_mmap.c.orig	2017-12-28 19:05:48 UTC
++++ opal/mca/pmix/pmix112/pmix/src/sm/pmix_mmap.c
+@@ -67,6 +67,9 @@ int _mmap_segment_create(pmix_sm_seg_t *sm_seg, const 
+     if (0 != (rc = posix_fallocate(sm_seg->seg_id, 0, size))) {
+         pmix_output_verbose(2, pmix_globals.debug_output,
+                 "sys call posix_fallocate(2) fail\n");
++        if (EINVAL == rc) {
++            goto ftruncate;
++        }
+         if (ENOSPC == rc) {
+             rc = PMIX_ERR_OUT_OF_RESOURCE;
+             goto out;
+@@ -86,6 +89,7 @@ int _mmap_segment_create(pmix_sm_seg_t *sm_seg, const 
+         goto map_memory;
+     }
+ #endif
++ftruncate:
+     if (0 != ftruncate(sm_seg->seg_id, size)) {
+         pmix_output_verbose(2, pmix_globals.debug_output,
+                 "sys call ftruncate(2) fail\n");