Blame SOURCES/0251-RHBZ-1614011-discovery-timeout.patch

a385ba
---
a385ba
 libmultipath/discovery.c |    5 ++++-
a385ba
 libmultipath/discovery.h |    2 +-
a385ba
 2 files changed, 5 insertions(+), 2 deletions(-)
a385ba
a385ba
Index: multipath-tools-130222/libmultipath/discovery.c
a385ba
===================================================================
a385ba
--- multipath-tools-130222.orig/libmultipath/discovery.c
a385ba
+++ multipath-tools-130222/libmultipath/discovery.c
a385ba
@@ -749,7 +749,10 @@ do_inq(int sg_fd, int cmddt, int evpd, u
a385ba
 	io_hdr.dxferp = resp;
a385ba
 	io_hdr.cmdp = inqCmdBlk;
a385ba
 	io_hdr.sbp = sense_b;
a385ba
-	io_hdr.timeout = DEF_TIMEOUT;
a385ba
+	if (conf->checker_timeout)
a385ba
+		io_hdr.timeout = conf->checker_timeout * 1000;
a385ba
+	else
a385ba
+		io_hdr.timeout = DEF_TIMEOUT;
a385ba
 
a385ba
 	if (ioctl(sg_fd, SG_IO, &io_hdr) < 0)
a385ba
 		return -1;
a385ba
Index: multipath-tools-130222/libmultipath/discovery.h
a385ba
===================================================================
a385ba
--- multipath-tools-130222.orig/libmultipath/discovery.h
a385ba
+++ multipath-tools-130222/libmultipath/discovery.h
a385ba
@@ -14,7 +14,7 @@
a385ba
 #endif
a385ba
 
a385ba
 #ifndef DEF_TIMEOUT
a385ba
-#define DEF_TIMEOUT	300000
a385ba
+#define DEF_TIMEOUT	60000
a385ba
 #endif
a385ba
 
a385ba
 /*