summaryrefslogtreecommitdiffstats
path: root/0002-multipath-fix-DEF_TIMEOUT-use.patch
diff options
context:
space:
mode:
Diffstat (limited to '0002-multipath-fix-DEF_TIMEOUT-use.patch')
-rw-r--r--0002-multipath-fix-DEF_TIMEOUT-use.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/0002-multipath-fix-DEF_TIMEOUT-use.patch b/0002-multipath-fix-DEF_TIMEOUT-use.patch
new file mode 100644
index 0000000..9df8ceb
--- /dev/null
+++ b/0002-multipath-fix-DEF_TIMEOUT-use.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+Date: Thu, 18 Jan 2018 13:13:54 -0600
+Subject: [PATCH] multipath: fix DEF_TIMEOUT use
+
+DEF_TIMEOUT is specified in seconds. The io_hdr timeout is specified in
+milliseconds, so we need to convert it. Multipath should be waiting
+longer than 30 milliseconds here. If there are concerns that 30 seconds
+may be too long, we could always make this configurable, using
+conf->checker_timeout if set.
+
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ libmultipath/discovery.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
+index 4b31dde..f118800 100644
+--- a/libmultipath/discovery.c
++++ b/libmultipath/discovery.c
+@@ -766,7 +766,7 @@ do_inq(int sg_fd, int cmddt, int evpd, unsigned int pg_op,
+ io_hdr.dxferp = resp;
+ io_hdr.cmdp = inqCmdBlk;
+ io_hdr.sbp = sense_b;
+- io_hdr.timeout = DEF_TIMEOUT;
++ io_hdr.timeout = DEF_TIMEOUT * 1000;
+
+ if (ioctl(sg_fd, SG_IO, &io_hdr) < 0)
+ return -1;
+--
+2.7.4
+