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