Merge from HEAD into b_lov. Mostly lprocfs changes.

diff --git a/lustre/tests/ba-echo.sh b/lustre/tests/ba-echo.sh
index e0187fd..d971016 100644 (file)
--- a/lustre/tests/ba-echo.sh
+++ b/lustre/tests/ba-echo.sh
@@ -5,7 +5,7 @@ config=${1:-ba-echo.xml}
 LMC="save_cmd"
 LMC_REAL="../../lustre/utils/lmc -m $config"
 
-PORT=2432
+PORT=988
 TCPBUF=1048576
 OST=ba-ost-1
 CLIENT=client

diff --git a/lustre/tests/ba-mount.sh b/lustre/tests/ba-mount.sh
index fe0a8e2..2a2ff3d 100644 (file)
--- a/lustre/tests/ba-mount.sh
+++ b/lustre/tests/ba-mount.sh
@@ -12,10 +12,10 @@
 
 config=${1:-ba-mount.xml}
 
+LMC_REAL="${LMC:-../utils/lmc} -m config"
 LMC="save_cmd"
-LMC_REAL="../../lustre/utils/lmc -m $config"
 
-PORT=2432
+PORT=988
 TCPBUF=1048576
 OST=ba-ost-1
 MDS=mds-hostname