- rebase b_io against HEAD in preparation for the latest write cache code

diff --git a/lustre/include/linux/lustre_ha.h b/lustre/include/linux/lustre_ha.h
index bfac4c3..87b0bf3 100644 (file)
--- a/lustre/include/linux/lustre_ha.h
+++ b/lustre/include/linux/lustre_ha.h
@@ -52,10 +52,12 @@ int recovd_setup(struct recovd_obd *mgr);
 int recovd_cleanup(struct recovd_obd *mgr);
 
 extern struct recovd_obd *ptlrpc_recovd;
+struct ptlrpc_request;
 
 int ptlrpc_run_recovery_upcall(struct ptlrpc_connection *conn);
-int ptlrpc_reconnect_import(struct obd_import *imp, int rq_opc);
-int ptlrpc_replay(struct obd_import *imp, int send_last_flag);
+int ptlrpc_reconnect_import(struct obd_import *imp, int rq_opc,
+                            struct ptlrpc_request **reqptr);
+int ptlrpc_replay(struct obd_import *imp);
 int ptlrpc_resend(struct obd_import *imp);
 void ptlrpc_free_committed(struct obd_import *imp);
 void ptlrpc_wake_delayed(struct obd_import *imp);

diff --git a/lustre/tests/llecho.sh b/lustre/tests/llecho.sh
index e99289c..d2497a4 100644 (file)
--- a/lustre/tests/llecho.sh
+++ b/lustre/tests/llecho.sh
@@ -1,50 +1,12 @@
 #!/bin/sh
 
-config=echo.xml
 LCONF=${LCONF:-../utils/lconf}
-LMC=${LMC:-../utils/lmc}
+NAME=${NAME:-echo}
 
-SERVER=localhost
-CLIENT=cfs4
+config=$NAME.xml
+mkconfig=$NAME.sh
 
-# FIXME: make LMC not require MDS for obdecho LOV
-MDSDEV=$TMP/mds1
-MDSSIZE=10000
-
-STRIPE_BYTES=65536
-STRIPES_PER_OBJ=2      # 0 means stripe over all OSTs
-
-LOV=0
-while [ "$1" ]; do
-        case $1 in
-        --lov) LOV="1" ;;
-       *) OPTS="$OPTS $1" ;;
-        esac
-        shift
-done
-
-rm -f $config
-# create nodes
-$LMC -o $config --add node --node $SERVER  || exit 1
-$LMC -m $config --add net --node $SERVER --nid $SERVER --nettype tcp || exit 2
-
-if (($LOV)); then
-    $LMC -m $config --add mds --node $SERVER --mds mds1 --dev $MDSDEV --size $MDSSIZE || exit 10
-    $LMC -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 11
-    $LMC -m $config --add ost --node $SERVER --lov lov1 --obdtype=obdecho || exit 12
-    $LMC -m $config --add ost --node $SERVER --lov lov1 --obdtype=obdecho || exit 13
-    OBD_NAME=lov1
-else
-    $LMC -m $config --add ost --obd obd1 --node $SERVER --obdtype=obdecho || exit 2
-    OBD_NAME=obd1
-fi
-
-if [ "$SERVER" != "$CLIENT" ]; then
-   $LMC -m $config --add node --node $CLIENT  || exit 1
-   $LMC -m $config --add net --node $CLIENT --nid $CLIENT --nettype tcp || exit 2
-fi
-
-$LMC -m $config --add echo_client --node $CLIENT --obd ${OBD_NAME} || exit 3
+sh $mkconfig $config || exit 1
 
 $LCONF --reformat --gdb $OPTS $config || exit 4