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

diff --git a/lustre/conf/lustre.dtd b/lustre/conf/lustre.dtd
index 51d1d1a..360f4a0 100644
--- a/lustre/conf/lustre.dtd
+++ b/lustre/conf/lustre.dtd
@@ -15,18 +15,18 @@
 <!ATTLIST lustre version CDATA #REQUIRED>
 
 <!ELEMENT node (network | routetbl | profile_ref | timeout | 
-                lustreUpcall | portalsUpcall)*>
+                lustreUpcall | portalsUpcall | ptldebug | subsystem)*>
 <!ATTLIST node %object.attr;
                router CDATA #IMPLIED>
                
 <!ELEMENT network (nid | port | route_tbl | sendmem | recvmem)*>
 <!ATTLIST network %object.attr;
-                  nettype (tcp | elan | gm | scimac) 'tcp'>
+                  nettype (tcp | elan | gm) 'tcp'>
 
 <!ELEMENT routetbl (route)*>
 <!ATTLIST routetbl %object.attr;>
 <!ELEMENT route %object.content;>
-<!ATTLIST route type (elan | tcp | gm | scimac) #REQUIRED
+<!ATTLIST route type (elan | tcp | gm) #REQUIRED
                 gw CDATA #REQUIRED
                 lo CDATA #REQUIRED
                 hi CDATA #IMPLIED >
@@ -36,7 +36,9 @@
                    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)>
@@ -49,7 +51,7 @@
 <!ATTLIST ptlrpc %object.attr;>
 
 <!ELEMENT osd (fstype | devpath | devsize | autoformat | 
-               target_ref | node_ref | journalsize )*>
+               target_ref | node_ref | journalsize | mkfsoptions | mountfsoptions)*>
 <!ATTLIST osd %object.attr; 
               osdtype (obdfilter | obdecho) 'obdfilter'>
 
@@ -57,12 +59,16 @@
 <!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 | 
-                  target_ref | node_ref | journalsize )*>
+                  target_ref | node_ref | journalsize | mkfsoptions | mountfsoptions)*>
 <!ATTLIST mdsdev %object.attr;>
 
 <!ELEMENT lov (mds_ref |(obd_ref)+)*>
@@ -78,7 +84,12 @@
 <!-- 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;>
@@ -110,16 +121,18 @@
 <!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 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 filesystem_ref  %objref.content;>
+<!ATTLIST filesystem_ref  %objref.attr;>
 <!ELEMENT echoclient_ref  %objref.content;>
 <!ATTLIST echoclient_ref  %objref.attr;>
 <!ELEMENT failover_ref    %objref.content;>