LU-6387 tests: fix lp_utils build issues on Power8

With the latest RHEL7 image for power8 some compile
issues have surfaced. Currently the issue is with
begin() and end() inline functions for the lp_util
code. The solution appears to not make the functions
inline.

Change-Id: I8f11ed488890407c117f13ebc741d7140702c647
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: http://review.whamcloud.com/22941
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/lp_utils.c b/lustre/tests/lp_utils.c
index e752c28..ea0170b 100644 (file)
--- a/lustre/tests/lp_utils.c
+++ b/lustre/tests/lp_utils.c
@@ -68,7 +68,7 @@ char *timestamp() {
         return datestring;
 }
 
-inline void begin(char *str) {
+void begin(char *str) {
         if (verbose > 0 && rank == 0) {
                 gettimeofday(&t1, NULL);
                 printf("%s:\tBeginning %s\n", timestamp(), str);
@@ -76,7 +76,7 @@ inline void begin(char *str) {
         }
 }
 
-inline void end(char *str) {
+void end(char *str) {
         float elapsed;
 
         MPI_Barrier(MPI_COMM_WORLD);

diff --git a/lustre/tests/lp_utils.h b/lustre/tests/lp_utils.h
index 0c6b87f..5406148 100644 (file)
--- a/lustre/tests/lp_utils.h
+++ b/lustre/tests/lp_utils.h
@@ -63,8 +63,8 @@ extern char hostname[];
 extern char *timestamp();
 extern char *testdir;
 
-extern inline void begin(char *str);
-extern inline void end(char *str);
+extern void begin(char *str);
+extern void end(char *str);
 
 extern void dump_diff(char *orig_buf, char *buf, int len, long off);
 extern void lp_gethostname(void);

diff --git a/lustre/tests/mpi/lp_utils.c b/lustre/tests/mpi/lp_utils.c
index e738164..879e814 100644 (file)
--- a/lustre/tests/mpi/lp_utils.c
+++ b/lustre/tests/mpi/lp_utils.c
@@ -67,7 +67,7 @@ char *timestamp() {
         return datestring;
 }
 
-inline void begin(char *str) {
+void begin(char *str) {
         if (verbose > 0 && rank == 0) {
                 gettimeofday(&t1, NULL);
                 printf("%s:\tBeginning %s\n", timestamp(), str);
@@ -75,7 +75,7 @@ inline void begin(char *str) {
         }
 }
 
-inline void end(char *str) {
+void end(char *str) {
         float elapsed;
 
         MPI_Barrier(MPI_COMM_WORLD);

diff --git a/lustre/tests/mpi/lp_utils.h b/lustre/tests/mpi/lp_utils.h
index dd289a6..c541690 100644 (file)
--- a/lustre/tests/mpi/lp_utils.h
+++ b/lustre/tests/mpi/lp_utils.h
@@ -63,8 +63,8 @@ extern char hostname[];
 extern char *timestamp();
 extern char *testdir;
 
-extern inline void begin(char *str);
-extern inline void end(char *str);
+extern void begin(char *str);
+extern void end(char *str);
 
 extern void dump_diff(char *orig_buf, char *buf, int len, long off);
 extern void lp_gethostname(void);