Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-7117 osp: set ptlrpc_request::rq_allow_replay properly
[fs/lustre-release.git]
/
lustre
/
conf
/
lustre.dtd
diff --git
a/lustre/conf/lustre.dtd
b/lustre/conf/lustre.dtd
index
96fdc8e
..
360f4a0
100644
(file)
--- a/
lustre/conf/lustre.dtd
+++ b/
lustre/conf/lustre.dtd
@@
-21,22
+21,23
@@
<!ELEMENT network (nid | port | route_tbl | sendmem | recvmem)*>
<!ATTLIST network %object.attr;
<!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;>
<!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 >
<!ELEMENT profile (ldlm_ref | ptlrpc_ref | network_ref | routetbl_ref |
osd_ref | mdsdev_ref | lovconfig_ref|
gw CDATA #REQUIRED
lo CDATA #REQUIRED
hi CDATA #IMPLIED >
<!ELEMENT profile (ldlm_ref | ptlrpc_ref | network_ref | routetbl_ref |
osd_ref | mdsdev_ref | lovconfig_ref|
- echoclient_ref | mountpoint_ref
| mgmt_ref
)*>
+ echoclient_ref | mountpoint_ref)*>
<!ATTLIST profile %object.attr;>
<!ELEMENT mountpoint path #REQUIRED
<!ATTLIST profile %object.attr;>
<!ELEMENT mountpoint path #REQUIRED
+ clientoptions #REQUIRED >
filesystem_ref #REQUIRED >
<!ATTLIST mountpoint %object.attr;>
filesystem_ref #REQUIRED >
<!ATTLIST mountpoint %object.attr;>
@@
-46,14
+47,11
@@
<!ELEMENT ldlm EMPTY>
<!ATTLIST ldlm %object.attr;>
<!ELEMENT ldlm EMPTY>
<!ATTLIST ldlm %object.attr;>
-<!ELEMENT mgmt (active_ref)*>
-<!ATTLIST mgmt %object.attr;>
-
<!ELEMENT ptlrpc EMPTY>
<!ATTLIST ptlrpc %object.attr;>
<!ELEMENT osd (fstype | devpath | devsize | autoformat |
<!ELEMENT ptlrpc EMPTY>
<!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'>
<!ATTLIST osd %object.attr;
osdtype (obdfilter | obdecho) 'obdfilter'>
@@
-62,8
+60,7
@@
failover ( 1 | 0 ) #IMPLIED>
<!ELEMENT filesystem mds_ref #REQUIRED
failover ( 1 | 0 ) #IMPLIED>
<!ELEMENT filesystem mds_ref #REQUIRED
- obd_ref #REQUIRED
- (mgmt_ref)* >
+ obd_ref #REQUIRED>
<!ATTLIST filesystem %object.attr;>
<!ELEMENT mds (active_ref | lovconfig_ref | group)*>
<!ATTLIST filesystem %object.attr;>
<!ELEMENT mds (active_ref | lovconfig_ref | group)*>
@@
-71,7
+68,7
@@
failover ( 1 | 0 ) #IMPLIED>
<!ELEMENT mdsdev (fstype | devpath | devsize | autoformat |
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)+)*>
<!ATTLIST mdsdev %object.attr;>
<!ELEMENT lov (mds_ref |(obd_ref)+)*>
@@
-90,6
+87,9
@@
<!ELEMENT ptldebug %object.content;>
<!ELEMENT subsystem %object.content;>
<!ELEMENT journalsize %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 fstype %object.content;>
<!ELEMENT nid %object.content;>
<!ELEMENT port %object.content;>
@@
-129,8
+129,6
@@
<!ATTLIST lov_ref %objref.attr;>
<!ELEMENT lovconfig_ref %objref.content;>
<!ATTLIST lovconfig_ref %objref.attr;>
<!ATTLIST lov_ref %objref.attr;>
<!ELEMENT lovconfig_ref %objref.content;>
<!ATTLIST lovconfig_ref %objref.attr;>
-<!ELEMENT mgmt_ref %objref.content;>
-<!ATTLIST mgmt_ref %objref.attr;>
<!ELEMENT mountpoint_ref %objref.content;>
<!ATTLIST mountpoint_ref %objref.attr;>
<!ELEMENT filesystem_ref %objref.content;>
<!ELEMENT mountpoint_ref %objref.content;>
<!ATTLIST mountpoint_ref %objref.attr;>
<!ELEMENT filesystem_ref %objref.content;>