From 55f0e1a1f859a0f16c4de3b1edf5ed4ba13e4818 Mon Sep 17 00:00:00 2001 From: Edgar Gabriel Date: Wed, 12 Aug 2015 09:45:07 -0500 Subject: [PATCH] fix the lustre compilation problems for older lustre versions. Add the prototype for the static function to avoid a warning message. --- ompi/mca/fs/lustre/fs_lustre.h | 6 ++++++ ompi/mca/fs/lustre/fs_lustre_file_open.c | 16 +++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ompi/mca/fs/lustre/fs_lustre.h b/ompi/mca/fs/lustre/fs_lustre.h index d32c642b3c..66cc0e605b 100644 --- a/ompi/mca/fs/lustre/fs_lustre.h +++ b/ompi/mca/fs/lustre/fs_lustre.h @@ -31,6 +31,12 @@ extern int mca_fs_lustre_stripe_width; BEGIN_C_DECLS + +#ifndef LOV_MAX_STRIPE_COUNT +#define LOV_MAX_STRIPE_COUNT 160 +#endif + + int mca_fs_lustre_component_init_query(bool enable_progress_threads, bool enable_mpi_threads); struct mca_fs_base_module_1_0_0_t * diff --git a/ompi/mca/fs/lustre/fs_lustre_file_open.c b/ompi/mca/fs/lustre/fs_lustre_file_open.c index 84fb6ffd61..24bc071a66 100644 --- a/ompi/mca/fs/lustre/fs_lustre_file_open.c +++ b/ompi/mca/fs/lustre/fs_lustre_file_open.c @@ -33,13 +33,8 @@ #include #include -/* - * file_open_lustre - * - * Function: - opens a new file - * Accepts: - same arguments as MPI_File_open() - * Returns: - Success if new file handle - */ +static void *alloc_lum(); + static void *alloc_lum() { int v1, v3, join; @@ -52,6 +47,13 @@ static void *alloc_lum() return malloc(MAX(v1, v3)); } +/* + * file_open_lustre + * + * Function: - opens a new file + * Accepts: - same arguments as MPI_File_open() + * Returns: - Success if new file handle + */ int mca_fs_lustre_file_open (struct ompi_communicator_t *comm,