File multipath-tools-update-documentation of Package multipath-tools

Index: multipath-tools-0.4.7/multipath/multipath.conf.5
===================================================================
--- multipath-tools-0.4.7.orig/multipath/multipath.conf.5
+++ multipath-tools-0.4.7/multipath/multipath.conf.5
@@ -111,9 +111,41 @@ identifier. Should be specified with an 
 is
 .I /sbin/scsi_id -g -u -s
 .TP
+.B prio
+Built-in default method to obtain a path priority value.
+The following methods are available:
+.RS
+.TP 12
+.B const
+Generate a constant priority for each path
+.TP
+.B emc
+Generate the path priority for EMC arrays
+.TP
+.B alua
+Generate the path priority based on the SCSI-3 ALUA settings.
+.TP
+.B ontap
+Generate the path priority for NetApp arrays.
+.TP
+.B rdac
+Generate the path priority for LSI/Engenio RDAC controller.
+.TP
+.B hp_sw
+Generate the path priority for Compaq/HP controller in
+active/standby mode.
+.TP
+.B hds
+Generate the path priority for Hitachi HDS Modular storage arrays.
+.TP
+Default value is \fBnone\fR.
+.RE
+.TP
 .B prio_callout
-The default program and args to callout to obtain a path priority
-value. The specified program will be executed and should return a
+Deprecated. Path priority should now determined with built-in
+prio_name. Using prio_callout may lead to deadlocks if multipathing
+is used on the root device.
+The specified program will be executed and should return a
 numeric value specifying the relative priority of this path. Higher
 number have a higher priority. A '%n' in the command line will be expanded
 to the device name, a '%b' will be expanded to the device number in
@@ -130,7 +162,7 @@ Generate the path priority for EMC array
 .B mpath_prio_alua /dev/%n
 Generate the path priority based on the SCSI-3 ALUA settings.
 .TP
-.B mpath_prio_netapp /dev/%n
+.B mpath_prio_ontap /dev/%n
 Generate the path priority for NetApp arrays.
 .TP
 .B mpath_prio_tpc /dev/%n
@@ -140,9 +172,16 @@ Generate the path priority for LSI/Engen
 Generate the path priority for Compaq/HP controller in
 active/standby mode.
 .TP
-.B mpath_prio_hds_modular %b
+.B mpath_prio_hds_modular /dev/%n
 Generate the path priority for Hitachi HDS Modular storage arrays.
 .TP
+.B mpath_prio_pref_path <pref> /dev/%n
+Generate the path priority relative to the preferred path given by
+.I <pref>
+which is the path name of the preferred path. The path identical to
+the preferred path will be assigned a priority of '1', all others a
+priority of '0'.
+.TP
 Default value is \fBnone\fR.
 .RE
 .TP
@@ -159,8 +198,8 @@ The default method used to determine the
 are
 .RS
 .TP 12
-.B readsector0
-Read the first sector of the device
+.B directio
+Read the first sector with direct I/O.
 .TP
 .B tur
 Issue a
@@ -177,10 +216,15 @@ Check the path state for HP storage arra
 .B rdac
 Check the path state for LSI/Engenio RDAC storage controller.
 .TP
-.B directio
-Read the first sector with direct I/O.
+.B cciss_tur
+Check the path state for HP SmartArray storage controller.
 .TP
-Default value is \fIreadsector0\fR.
+.B readsector0
+(Deprecated) Read the first sector of the device.
+.TP 0
+Default value is \fIdirectio\fR. Using \fIreadsector0\fR as
+path_checker is deprecated as it's reported to not work correctly on
+certain devices.
 .RE
 .TP
 .B failback
@@ -348,6 +392,16 @@ The following hardware handler are imple
 .TP 12
 .B 1 emc
 Hardware handler for EMC storage arrays.
+.TP
+.B 1 rdac
+Hardware handler for LSI/Engenio RDAC storage controller.
+.TP
+.B 1 hp_sw
+Hardware handler for Compaq/HP storage arrays in active/standby
+mode.
+.TP
+.B 1 alua
+Hardware handler for SCSI-3 ALUA compatible arrays.
 .RE
 .LP
 The following attributes are optional; if not set the default values
@@ -368,6 +422,8 @@ section:
 .TP
 .B features
 .TP
+.B prio
+.TP
 .B prio_callout
 .TP
 .B failback
@@ -382,6 +438,15 @@ section:
 .RE
 .PD
 .LP
+.SH "KNOWN ISSUES"
+The usage of
+.B queue_if_no_path
+option can lead to
+.B D state
+processes being hung and not killable in situations where all the paths to the LUN go offline.
+It is advisable to use the
+.B no_path_retry
+option instead.
 .SH "SEE ALSO"
 .BR udev (8),
 .BR dmsetup (8)
Index: multipath-tools-0.4.7/multipath.conf.annotated
===================================================================
--- multipath-tools-0.4.7.orig/multipath.conf.annotated
+++ multipath-tools-0.4.7/multipath.conf.annotated
@@ -140,13 +140,12 @@
 ## name    : blacklist
 ## scope   : multipath & multipathd
 ## desc    : list of device names to discard as not multipath candidates
-## default : cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop
+## default : fd, hd, md, dm, sr, scd, st, ram, raw, loop
 ##
 #blacklist {
 #       wwid 26353900f02796769
 #	devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
 #	devnode "^hd[a-z][[0-9]*]"
-#	devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
 #       device {
 #               vendor DEC.*
 #               product MSA[15]00