device-mapper-multipath-0.4.9-68

Modify multipath.conf
  * remove getuid_callout example
Re-add 0050-RH-listing-speedup.patch
Add 0081-RHBZ-1066264-check-prefix-on-rename.patch
  * make multipath check the prefix on kpartx partitions during rename, and
    copy the existing behaviour
Add 0082-UPBZ-1109995-no-sync-turs-on-pthread_cancel.patch
  * If async tur checker fails on threads, don't retry with the sync version
Add 0083-RHBZ-1080055-orphan-paths-on-reload.patch
  * Fix case where pathlist wasn't getting updated properly
Add 0084-RHBZ-1110000-multipath-man.patch
  * fix errors in multipath man page
Add 0085-UPBZ-1110006-datacore-config.patch
  * Add support for DataCore Virtual Disk
Add 0086-RHBZ-1110007-orphan-path-on-failed-add.patch
  * If multipathd fails to add path correctly, it now fully orphans the path
Add 0087-RHBZ-1110013-config-error-checking.patch
  * Improve multipath.conf error checking.
Add 0088-RHBZ-1069811-configurable-prio-timeout.patch
  * checker_timeout now adjusts the timeouts of the prioritizers as well.
Add 0089-RHBZ-1110016-add-noasync-option.patch
  * Add a new defaults option, "force_sync", that disables the async mode
    of the path checkers. This is for cases where to many parallel checkers
    hog the cpu
Add 0090-UPBZ-1080038-reorder-paths-for-round-robin.patch
  * make multipathd order paths for better throughput in round-robin mode
Add 0091-RHBZ-1069584-fix-empty-values-fast-io-fail-and-dev-loss.patch
  * check for null pointers in configuration reading code.
Add 0092-UPBZ-1104605-reload-on-rename.patch
  * Reload table on rename if necessary
Add 0093-UPBZ-1086825-user-friendly-name-remap.patch
  * Keep existing user_friend_name if possible
Add 0094-RHBZ-1086825-cleanup-remap.patch
  * Cleanup issues with upstream patch
Add 0095-RHBZ-1127944-xtremIO-config.patch
  * Add support for EMC ExtremIO devices
Add 0096-RHBZ-979474-new-wildcards.patch
  * Add N, n, R, and r path wildcards to print World Wide ids
Add 0097-RH-fix-coverity-errors.patch
  * Fix a number of unterminated strings and memory leaks on failure
    paths.
Add 0098-UPBZ-1067171-mutipath-i.patch
  * Add -i option to ignore wwids file when checking for valid paths
Add 0099-RH-add-all-devs.patch
  * Add new devices config option all_devs. This makes the configuration
    overwrite the specified values in all builtin configs
Add 0100-RHBZ-1067171-multipath-i-update.patch
  * make -i work correctly with find_multipaths
Add 0101-RH-adapter-name-wildcard.patch
  * Add 'a' path wildcard to print adapter name

1 files changed, 178 insertions, 0 deletions

diff --git a/0088-RHBZ-1069811-configurable-prio-timeout.patch b/0088-RHBZ-1069811-configurable-prio-timeout.patch
new file mode 100644
index 0000000..60f374b
--- /dev/null
+++ b/0088-RHBZ-1069811-configurable-prio-timeout.patch
@@ -0,0 +1,178 @@
+---
+ libmultipath/prio.c                   |    7 +++++++
+ libmultipath/prio.h                   |    1 +
+ libmultipath/prioritizers/alua_rtpg.c |    5 +++--
+ libmultipath/prioritizers/emc.c       |    2 +-
+ libmultipath/prioritizers/hds.c       |    2 +-
+ libmultipath/prioritizers/hp_sw.c     |    2 +-
+ libmultipath/prioritizers/ontap.c     |    4 ++--
+ libmultipath/prioritizers/rdac.c      |    2 +-
+ multipath.conf.annotated              |    5 +++--
+ multipath/multipath.conf.5            |    4 ++--
+ 10 files changed, 22 insertions(+), 12 deletions(-)
+
+Index: multipath-tools-130222/libmultipath/prio.c
+===================================================================
+--- multipath-tools-130222.orig/libmultipath/prio.c
++++ multipath-tools-130222/libmultipath/prio.c
+@@ -10,6 +10,13 @@
+ 
+ static LIST_HEAD(prioritizers);
+ 
++unsigned int get_prio_timeout(unsigned int default_timeout)
++{
++	if (conf->checker_timeout)
++		return conf->checker_timeout * 1000;
++	return default_timeout;
++}
++
+ int init_prio (void)
+ {
+ 	if (!add_prio(DEFAULT_PRIO))
+Index: multipath-tools-130222/libmultipath/prio.h
+===================================================================
+--- multipath-tools-130222.orig/libmultipath/prio.h
++++ multipath-tools-130222/libmultipath/prio.h
+@@ -51,6 +51,7 @@ struct prio {
+ 	int (*getprio)(struct path *, char *);
+ };
+ 
++unsigned int get_prio_timeout(unsigned int default_timeout);
+ int init_prio (void);
+ void cleanup_prio (void);
+ struct prio * add_prio (char *);
+Index: multipath-tools-130222/libmultipath/prioritizers/alua_rtpg.c
+===================================================================
+--- multipath-tools-130222.orig/libmultipath/prioritizers/alua_rtpg.c
++++ multipath-tools-130222/libmultipath/prioritizers/alua_rtpg.c
+@@ -21,6 +21,7 @@
+ #define __user
+ #include <scsi/sg.h>
+ 
++#include "../prio.h"
+ #include "alua_rtpg.h"
+ 
+ #define SENSE_BUFF_LEN  32
+@@ -134,7 +135,7 @@ do_inquiry(int fd, int evpd, unsigned in
+ 	hdr.dxfer_len		= resplen;
+ 	hdr.sbp			= sense;
+ 	hdr.mx_sb_len		= sizeof(sense);
+-	hdr.timeout		= DEF_TIMEOUT;
++	hdr.timeout		= get_prio_timeout(DEF_TIMEOUT);
+ 
+ 	if (ioctl(fd, SG_IO, &hdr) < 0) {
+ 		PRINT_DEBUG("do_inquiry: IOCTL failed!\n");
+@@ -253,7 +254,7 @@ do_rtpg(int fd, void* resp, long resplen
+ 	hdr.dxfer_len		= resplen;
+ 	hdr.mx_sb_len		= sizeof(sense);
+ 	hdr.sbp			= sense;
+-	hdr.timeout		= DEF_TIMEOUT;
++	hdr.timeout		= get_prio_timeout(DEF_TIMEOUT);
+ 
+ 	if (ioctl(fd, SG_IO, &hdr) < 0)
+ 		return -RTPG_RTPG_FAILED;
+Index: multipath-tools-130222/libmultipath/prioritizers/emc.c
+===================================================================
+--- multipath-tools-130222.orig/libmultipath/prioritizers/emc.c
++++ multipath-tools-130222/libmultipath/prioritizers/emc.c
+@@ -31,7 +31,7 @@ int emc_clariion_prio(const char *dev, i
+ 	io_hdr.dxferp = sense_buffer;
+ 	io_hdr.cmdp = inqCmdBlk;
+ 	io_hdr.sbp = sb;
+-	io_hdr.timeout = 60000;
++	io_hdr.timeout = get_prio_timeout(60000);
+ 	io_hdr.pack_id = 0;
+ 	if (ioctl(fd, SG_IO, &io_hdr) < 0) {
+ 		pp_emc_log(0, "sending query command failed");
+Index: multipath-tools-130222/libmultipath/prioritizers/hds.c
+===================================================================
+--- multipath-tools-130222.orig/libmultipath/prioritizers/hds.c
++++ multipath-tools-130222/libmultipath/prioritizers/hds.c
+@@ -114,7 +114,7 @@ int hds_modular_prio (const char *dev, i
+ 	io_hdr.dxferp = inqBuff;
+ 	io_hdr.cmdp = inqCmdBlk;
+ 	io_hdr.sbp = sense_buffer;
+-	io_hdr.timeout = 2000;	/* TimeOut = 2 seconds */
++	io_hdr.timeout = get_prio_timeout(2000); /* TimeOut = 2 seconds */
+ 
+ 	if (ioctl (fd, SG_IO, &io_hdr) < 0) {
+ 		pp_hds_log(0, "SG_IO error");
+Index: multipath-tools-130222/libmultipath/prioritizers/hp_sw.c
+===================================================================
+--- multipath-tools-130222.orig/libmultipath/prioritizers/hp_sw.c
++++ multipath-tools-130222/libmultipath/prioritizers/hp_sw.c
+@@ -46,7 +46,7 @@ int hp_sw_prio(const char *dev, int fd)
+ 	io_hdr.dxfer_direction = SG_DXFER_NONE;
+ 	io_hdr.cmdp = turCmdBlk;
+ 	io_hdr.sbp = sb;
+-	io_hdr.timeout = 60000;
++	io_hdr.timeout = get_prio_timeout(60000);
+ 	io_hdr.pack_id = 0;
+  retry:
+ 	if (ioctl(fd, SG_IO, &io_hdr) < 0) {
+Index: multipath-tools-130222/libmultipath/prioritizers/ontap.c
+===================================================================
+--- multipath-tools-130222.orig/libmultipath/prioritizers/ontap.c
++++ multipath-tools-130222/libmultipath/prioritizers/ontap.c
+@@ -89,7 +89,7 @@ static int send_gva(const char *dev, int
+ 	io_hdr.dxferp = results;
+ 	io_hdr.cmdp = cdb;
+ 	io_hdr.sbp = sb;
+-	io_hdr.timeout = SG_TIMEOUT;
++	io_hdr.timeout = get_prio_timeout(SG_TIMEOUT);
+ 	io_hdr.pack_id = 0;
+ 	if (ioctl(fd, SG_IO, &io_hdr) < 0) {
+ 		pp_ontap_log(0, "SG_IO ioctl failed, errno=%d", errno);
+@@ -141,7 +141,7 @@ static int get_proxy(const char *dev, in
+ 	io_hdr.dxferp = results;
+ 	io_hdr.cmdp = cdb;
+ 	io_hdr.sbp = sb;
+-	io_hdr.timeout = SG_TIMEOUT;
++	io_hdr.timeout = get_prio_timeout(SG_TIMEOUT);
+ 	io_hdr.pack_id = 0;
+ 	if (ioctl(fd, SG_IO, &io_hdr) < 0) {
+ 		pp_ontap_log(0, "ioctl sending inquiry command failed, "
+Index: multipath-tools-130222/libmultipath/prioritizers/rdac.c
+===================================================================
+--- multipath-tools-130222.orig/libmultipath/prioritizers/rdac.c
++++ multipath-tools-130222/libmultipath/prioritizers/rdac.c
+@@ -31,7 +31,7 @@ int rdac_prio(const char *dev, int fd)
+ 	io_hdr.dxferp = sense_buffer;
+ 	io_hdr.cmdp = inqCmdBlk;
+ 	io_hdr.sbp = sb;
+-	io_hdr.timeout = 60000;
++	io_hdr.timeout = get_prio_timeout(60000);
+ 	io_hdr.pack_id = 0;
+ 	if (ioctl(fd, SG_IO, &io_hdr) < 0) {
+ 		pp_rdac_log(0, "sending inquiry command failed");
+Index: multipath-tools-130222/multipath.conf.annotated
+===================================================================
+--- multipath-tools-130222.orig/multipath.conf.annotated
++++ multipath-tools-130222/multipath.conf.annotated
+@@ -188,8 +188,9 @@
+ #	#
+ #	# name    : checker_timeout
+ #	# scope   : multipath & multipathd
+-#	# desc    : The timeout to use for path checkers that issue scsi
+-#	#           commands with an explicit timeout, in seconds.
++#	# desc    : The timeout to use for path checkers and prioritizers
++#	#           that issue scsi commands with an explicit timeout, in
++#	#           seconds.
+ #	# values  : n > 0
+ #	# default : taken from /sys/block/sd<x>/device/timeout
+ #	checker_timeout 60
+Index: multipath-tools-130222/multipath/multipath.conf.5
+===================================================================
+--- multipath-tools-130222.orig/multipath/multipath.conf.5
++++ multipath-tools-130222/multipath/multipath.conf.5
+@@ -321,8 +321,8 @@ maximum number of open fds is taken from
+ if that number is greated than 1024.
+ .TP
+ .B checker_timeout
+-Specify the timeout to user for path checkers that issue scsi commands with an
+-explicit timeout, in seconds; default taken from
++Specify the timeout to use for path checkers and prioritizers that issue scsi
++commands with an explicit timeout, in seconds; default taken from
+ .I /sys/block/sd<x>/device/timeout
+ .TP
+ .B fast_io_fail_tmo