b=1803

r=shaver

New import state machine, as documented on the lustre wiki in
ImportStates.

A new function, ptlrpc_connect_import, performs all import connects
and moves the import from the DISCON state to either FULL, EVICTED,
REPLAY, or RECOVER, depending on the situation. Unlike the levels, the
states are now exact, and the request->rq_send_state much match the
import state to be sent.

Passes recovery/01, replay-small, and replay-dual.

diff --git a/lustre/ptlrpc/ptlrpc_module.c b/lustre/ptlrpc/ptlrpc_module.c
index 2d84597..d33670f 100644 (file)
--- a/lustre/ptlrpc/ptlrpc_module.c
+++ b/lustre/ptlrpc/ptlrpc_module.c
@@ -220,7 +220,8 @@ EXPORT_SYMBOL(ptlrpc_ldlm_hooks_referenced);
 /* recover.c */
 EXPORT_SYMBOL(ptlrpc_run_recovery_over_upcall);
 EXPORT_SYMBOL(ptlrpc_run_failed_import_upcall);
-EXPORT_SYMBOL(ptlrpc_reconnect_import);
+EXPORT_SYMBOL(ptlrpc_connect_import);
+EXPORT_SYMBOL(ptlrpc_disconnect_import);
 EXPORT_SYMBOL(ptlrpc_replay);
 EXPORT_SYMBOL(ptlrpc_resend);
 EXPORT_SYMBOL(ptlrpc_wake_delayed);