b=17605

Somehow a couple of the changes escaped assimilation.

diff --git a/lustre/tests/mpi/lp_utils.c b/lustre/tests/mpi/lp_utils.c
index 91ae0b0..068cbf5 100644 (file)
--- a/lustre/tests/mpi/lp_utils.c
+++ b/lustre/tests/mpi/lp_utils.c
@@ -50,7 +50,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include "lustre/lustre_user.h"
-#include "lustre/tests/lp_utils.h"
+#include "lustre/tests/mpi/lp_utils.h"
 
 #define MAX_PROCESSES 8
 

diff --git a/lustre/tests/mpi/parallel_grouplock.c b/lustre/tests/mpi/parallel_grouplock.c
index d88033f..e094d1c 100644 (file)
--- a/lustre/tests/mpi/parallel_grouplock.c
+++ b/lustre/tests/mpi/parallel_grouplock.c
@@ -50,7 +50,7 @@
 #include <time.h>
 #include <errno.h>
 #include <lustre/lustre_user.h>
-#include <lustre/tests/lp_utils.h>
+#include <lustre/tests/mpi/lp_utils.h>
 
 #define LPGL_FILEN 700000
 #define LPGL_TEST_ITEMS 7