b=1046

- add a new argument to upcalls. The first argument identifies the reason
  of upcall.  The upcall script path is now /proc/sys/lustre/upcall, and the
  config option has changed from --recovery_upcall to --lustre_upcall.

  Current lustre upcall types and arguments:

    FAILED_IMPORT tgt_uuid dev_uuid net_uuid
    RECOVERY_OVER dev_uuid

- The config tools also support the new --portals_upcall, and both of the
  upcalls can be set to the same script with the --upcall option.

  There is only one portals upcall type:

    LBUG filename function line

diff --git a/lustre/ptlrpc/ptlrpc_module.c b/lustre/ptlrpc/ptlrpc_module.c
index 44d535a..8646e72 100644 (file)
--- a/lustre/ptlrpc/ptlrpc_module.c
+++ b/lustre/ptlrpc/ptlrpc_module.c
@@ -213,7 +213,8 @@ EXPORT_SYMBOL(ptlrpc_put_ldlm_hooks);
 EXPORT_SYMBOL(ptlrpc_ldlm_hooks_referenced);
 
 /* recover.c */
-EXPORT_SYMBOL(ptlrpc_run_recovery_upcall);
+EXPORT_SYMBOL(ptlrpc_run_recovery_over_upcall);
+EXPORT_SYMBOL(ptlrpc_run_failed_import_upcall);
 EXPORT_SYMBOL(ptlrpc_reconnect_import);
 EXPORT_SYMBOL(ptlrpc_replay);
 EXPORT_SYMBOL(ptlrpc_resend);