X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fconf%2Flustre.dtd;h=360f4a03b45171e7e3cc1e2251f00522f1f176dc;hb=9461ed3fff67d81a9de08653fdb6975db8b76be3;hp=73f7c95e714aa21022ef1f58db3f6a7abbfaae9c;hpb=ccb42f2458669aaac84a661091b05a59bb781197;p=fs%2Flustre-release.git

diff --git a/lustre/conf/lustre.dtd b/lustre/conf/lustre.dtd
index 73f7c95..360f4a0 100644
--- a/lustre/conf/lustre.dtd
+++ b/lustre/conf/lustre.dtd
@@ -10,10 +10,12 @@
 <!ENTITY % objref.attr    "uuidref CDATA #REQUIRED">
 
 <!-- main elements -->
-<!ELEMENT lustre (node | profile | mountpoint | ldlm | echoclient |
-                  mds | obd | ost | lov | lovconfig)*>
+<!ELEMENT lustre (node | profile | mountpoint | ldlm | ptlrpc |echoclient |
+                  mds | mdsdev| ost | osd | lov | lovconfig)*>
+<!ATTLIST lustre version CDATA #REQUIRED>
 
-<!ELEMENT node (network | profile_ref)*>
+<!ELEMENT node (network | routetbl | profile_ref | timeout | 
+                lustreUpcall | portalsUpcall | ptldebug | subsystem)*>
 <!ATTLIST node %object.attr;
                router CDATA #IMPLIED>
                
@@ -29,12 +31,14 @@
                 lo CDATA #REQUIRED
                 hi CDATA #IMPLIED >
 
-<!ELEMENT profile (ldlm_ref | network_ref | obd_ref | ost_ref |
-                   echoclient_ref | mdsdev_ref | lov_ref |
-                   lovconfig_ref| mountpoint_ref)*>
+<!ELEMENT profile (ldlm_ref | ptlrpc_ref | network_ref | routetbl_ref |
+                   osd_ref | mdsdev_ref | lovconfig_ref|
+                   echoclient_ref | mountpoint_ref)*>
 <!ATTLIST profile %object.attr;>
 
-<!ELEMENT mountpoint (path | fileset | mds_ref | obd_ref)*>
+<!ELEMENT mountpoint path #REQUIRED
+                     clientoptions #REQUIRED >
+                     filesystem_ref #REQUIRED >
 <!ATTLIST mountpoint %object.attr;>
 
 <!ELEMENT echoclient (obd_ref)>
@@ -43,18 +47,28 @@
 <!ELEMENT ldlm EMPTY>
 <!ATTLIST ldlm %object.attr;>
 
-<!ELEMENT obd (fstype | devpath | devsize | autoformat | active_ref)*>
-<!ATTLIST obd %object.attr; 
-              obdtype (obdfilter | obdecho) 'obdfilter'>
+<!ELEMENT ptlrpc EMPTY>
+<!ATTLIST ptlrpc %object.attr;>
 
-<!ELEMENT ost (network_ref | obd_ref | failover_ref)*>
-<!ATTLIST ost %object.attr;>
+<!ELEMENT osd (fstype | devpath | devsize | autoformat | 
+               target_ref | node_ref | journalsize | mkfsoptions | mountfsoptions)*>
+<!ATTLIST osd %object.attr; 
+              osdtype (obdfilter | obdecho) 'obdfilter'>
 
-<!ELEMENT mds (active_ref)*>
-<!ATTLIST mds %object.attr;>
+<!ELEMENT ost (active_ref | group)*>
+<!ATTLIST ost %object.attr;
+              failover ( 1 | 0 ) #IMPLIED>
+
+<!ELEMENT filesystem mds_ref #REQUIRED
+                     obd_ref #REQUIRED>
+<!ATTLIST filesystem %object.attr;>
+
+<!ELEMENT mds (active_ref | lovconfig_ref | group)*>
+<!ATTLIST mds %object.attr;
+              failover ( 1 | 0 ) #IMPLIED>
 
 <!ELEMENT mdsdev (fstype | devpath | devsize | autoformat | 
-                  mds_ref | network_ref )*>
+                  target_ref | node_ref | journalsize | mkfsoptions | mountfsoptions)*>
 <!ATTLIST mdsdev %object.attr;>
 
 <!ELEMENT lov (mds_ref |(obd_ref)+)*>
@@ -68,11 +82,19 @@
 <!ATTLIST lovconfig %object.attr;>
 
 <!-- basic elements -->
+<!ELEMENT recoveryUpcall %object.content;>
+<!ELEMENT timeout       %object.content;>
+<!ELEMENT ptldebug      %object.content;>
+<!ELEMENT subsystem     %object.content;>
+<!ELEMENT journalsize   %object.content;>
+<!ELEMENT mkfsoptions   %object.content;>
+<!ELEMENT mountfsoptions %object.content;>
+<!ELEMENT clientoptions %object.content;>
 <!ELEMENT fstype        %object.content;>
 <!ELEMENT nid           %object.content;>
 <!ELEMENT port          %object.content;>
-<!ELEMENT send_mem      %object.content;>
-<!ELEMENT recv_mem      %object.content;>
+<!ELEMENT sendmem       %object.content;>
+<!ELEMENT recvmem       %object.content;>
 <!ELEMENT autoformat    %object.content;>
 <!ELEMENT activetarget  %object.content;>
 <!ELEMENT devpath       %object.content;>
@@ -83,29 +105,41 @@
 <!-- object reference tag elements -->
 <!ELEMENT network_ref     %objref.content;>
 <!ATTLIST network_ref     %objref.attr;>
+<!ELEMENT routetbl_ref    %objref.content;>
+<!ATTLIST routetbl_ref    %objref.attr;>
 <!ELEMENT node_ref        %objref.content;>
 <!ATTLIST node_ref        %objref.attr;>
 <!ELEMENT profile_ref     %objref.content;>
 <!ATTLIST profile_ref     %objref.attr;>
-<!ELEMENT obd_ref         %objref.content;>
-<!ATTLIST obd_ref         %objref.attr;>
+<!ELEMENT osd_ref         %objref.content;>
+<!ATTLIST osd_ref         %objref.attr;>
 <!ELEMENT mds_ref         %objref.content;>
 <!ATTLIST mds_ref         %objref.attr;>
 <!ELEMENT mdsdev_ref      %objref.content;>
 <!ATTLIST mdsdev_ref      %objref.attr;>
+<!ELEMENT obd_ref         %objref.content;>
+<!ATTLIST obd_ref         %objref.attr;>
 <!ELEMENT ost_ref         %objref.content;>
 <!ATTLIST ost_ref         %objref.attr;>
+<!ELEMENT active_ref      %objref.content;>
+<!ATTLIST active_ref      %objref.attr;>
+<!ELEMENT target_ref      %objref.content;>
+<!ATTLIST target_ref      %objref.attr;>
 <!ELEMENT lov_ref         %objref.content;>
 <!ATTLIST lov_ref         %objref.attr;>
 <!ELEMENT lovconfig_ref   %objref.content;>
 <!ATTLIST lovconfig_ref   %objref.attr;>
 <!ELEMENT mountpoint_ref  %objref.content;>
 <!ATTLIST mountpoint_ref  %objref.attr;>
-<!ELEMENT echoclient_ref %objref.content;>
-<!ATTLIST echoclient_ref %objref.attr;>
+<!ELEMENT filesystem_ref  %objref.content;>
+<!ATTLIST filesystem_ref  %objref.attr;>
+<!ELEMENT echoclient_ref  %objref.content;>
+<!ATTLIST echoclient_ref  %objref.attr;>
 <!ELEMENT failover_ref    %objref.content;>
 <!ATTLIST failover_ref    %objref.attr;>
 <!ELEMENT ldlm_ref        %objref.content;>
 <!ATTLIST ldlm_ref        %objref.attr;>
+<!ELEMENT ptlrpc_ref      %objref.content;>
+<!ATTLIST ptlrpc_ref      %objref.attr;>