From 4a32a2cbb3bd3847f99f415897bd9fc2d3a6af4f Mon Sep 17 00:00:00 2001
From: Rob Latham <robl@mcs.anl.gov>
Date: Tue, 28 Aug 2018 16:24:34 -0500
Subject: [PATCH 1/2] =?UTF-8?q?fix=20"number=20of=20arguments=20doesn?=
 =?UTF-8?q?=E2=80=99t=20match=20prototype"=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/aiori-NCMPI.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/aiori-NCMPI.c b/src/aiori-NCMPI.c
index e7d8e35..b096c50 100755
--- a/src/aiori-NCMPI.c
+++ b/src/aiori-NCMPI.c
@@ -53,7 +53,7 @@ static IOR_offset_t NCMPI_Xfer(int, void *, IOR_size_t *,
                                IOR_offset_t, IOR_param_t *);
 static void NCMPI_Close(void *, IOR_param_t *);
 static void NCMPI_Delete(char *, IOR_param_t *);
-static char *NCMPI_GetVersion(IOR_param_t *);
+static char *NCMPI_GetVersion();
 static void NCMPI_Fsync(void *, IOR_param_t *);
 static IOR_offset_t NCMPI_GetFileSize(IOR_param_t *, MPI_Comm, char *);
 static int NCMPI_Access(const char *, int, IOR_param_t *);

From cb88c4c19a831d94b864c49a162e2635031ae7bb Mon Sep 17 00:00:00 2001
From: Rob Latham <robl@mcs.anl.gov>
Date: Tue, 28 Aug 2018 16:27:21 -0500
Subject: [PATCH 2/2] including lustre_user now deprecated

put in a configure test (same one used in ROMIO) in case someone's using
old Lustre client headers
---
 configure.ac      | 2 +-
 src/aiori-POSIX.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7042355..a59cba4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ AC_ARG_WITH([lustre],
                 [support configurable Lustre striping values @<:@default=check@:>@])],
         [], [with_lustre=check])
 AS_IF([test "x$with_lustre" != xno], [
-        AC_CHECK_HEADERS([lustre/lustre_user.h], [], [
+        AC_CHECK_HEADERS([linux/lustre/lustre_user.h lustre/lustre_user.h], break, [
                 if test "x$with_lustre" != xcheck; then
                         AC_MSG_FAILURE([--with-lustre was given, <lustre/lustre_user.h> not found])
                 fi
diff --git a/src/aiori-POSIX.c b/src/aiori-POSIX.c
index 9e740a6..0dd712e 100755
--- a/src/aiori-POSIX.c
+++ b/src/aiori-POSIX.c
@@ -31,9 +31,13 @@
 #include <sys/stat.h>
 #include <assert.h>
 
+
 #ifdef HAVE_LUSTRE_LUSTRE_USER_H
 #  include <lustre/lustre_user.h>
 #endif
+#ifdef HAVE_LINUX_LUSTRE_LUSTRE_USER_H
+#  include <linux/lustre/lustre_user.h>
+#endif
 #ifdef HAVE_GPFS_H
 #  include <gpfs.h>
 #endif