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/conf/lustre2ldif.xsl b/lustre/conf/lustre2ldif.xsl
index 8484789..5fc6f9c 100644 (file)
--- a/lustre/conf/lustre2ldif.xsl
+++ b/lustre/conf/lustre2ldif.xsl
@@ -27,8 +27,11 @@ profileRef: <value-of select="@uuidref"/>
 <if test="timeout">
 timeout: <value-of select="timeout"/>
 </if>
-<if test="recoveryUpcall">
-recoveryUpcall: <value-of select="recoveryUpcall"/>
+<if test="lustreUpcall">
+lustreUpcall: <value-of select="lustreUpcall"/>
+</if>
+<if test="portalsUpcall">
+portalsUpcall: <value-of select="portalsUpcall"/>
 </if>
 <text>
 </text>