|
 |
587c20 |
From 1aa35262d566d829d711bc746f944dee5c2d9e7a Mon Sep 17 00:00:00 2001
|
|
|
587c20 |
From: rpm-build <rpm-build>
|
|
|
587c20 |
Date: Tue, 28 Feb 2017 09:00:41 -0800
|
|
|
587c20 |
Subject: [PATCH 21/32] libiscsi: fix discovery request timeout regression
|
|
|
587c20 |
|
|
|
587c20 |
---
|
|
|
587c20 |
libiscsi/libiscsi.c | 2 ++
|
|
|
587c20 |
1 file changed, 2 insertions(+)
|
|
|
587c20 |
|
|
|
587c20 |
diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
|
|
|
587c20 |
index 755c18ca8e3b..bb17dfcafded 100644
|
|
|
587c20 |
--- a/libiscsi/libiscsi.c
|
|
|
587c20 |
+++ b/libiscsi/libiscsi.c
|
|
|
587c20 |
@@ -136,6 +136,7 @@ int libiscsi_discover_sendtargets(struct libiscsi_context *context,
|
|
|
587c20 |
|
|
|
587c20 |
/* Fill the drec struct with all needed info */
|
|
|
587c20 |
memset(&drec, 0, sizeof drec);
|
|
|
587c20 |
+ drec.iscsid_req_tmo = -1;
|
|
|
587c20 |
idbm_sendtargets_defaults(&drec.u.sendtargets);
|
|
|
587c20 |
drec.type = DISCOVERY_TYPE_SENDTARGETS;
|
|
|
587c20 |
strlcpy(drec.address, address, sizeof(drec.address));
|
|
|
587c20 |
@@ -228,6 +229,7 @@ int libiscsi_discover_firmware(struct libiscsi_context *context,
|
|
|
587c20 |
CHECK(iface_create_ifaces_from_boot_contexts(&ifaces, &targets));
|
|
|
587c20 |
|
|
|
587c20 |
memset(&drec, 0, sizeof(drec));
|
|
|
587c20 |
+ drec.iscsid_req_tmo = -1;
|
|
|
587c20 |
drec.type = DISCOVERY_TYPE_FW;
|
|
|
587c20 |
rc = idbm_bind_ifaces_to_nodes(discovery_fw, &drec, &ifaces, &rec_list);
|
|
|
587c20 |
if (rc) {
|
|
|
587c20 |
--
|
|
|
587c20 |
2.14.4
|
|
|
587c20 |
|