summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
Diffstat (limited to 'usr')
-rw-r--r--usr/iscsi_sysfs.c2
-rw-r--r--usr/iscsi_sysfs.h1
-rw-r--r--usr/iscsid_req.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
index 5298a6b..540adfd 100644
--- a/usr/iscsi_sysfs.c
+++ b/usr/iscsi_sysfs.c
@@ -1438,7 +1438,7 @@ int iscsi_sysfs_for_each_session(void *data, int *nr_found,
if (!info)
return ISCSI_ERR_NOMEM;
- info->iscsid_req_tmo = -1;
+ info->iscsid_req_tmo = ISCSID_RESP_POLL_TIMEOUT;
n = scandir(ISCSI_SESSION_DIR, &namelist, trans_filter,
alphasort);
if (n <= 0)
diff --git a/usr/iscsi_sysfs.h b/usr/iscsi_sysfs.h
index 1d0377f..9575c65 100644
--- a/usr/iscsi_sysfs.h
+++ b/usr/iscsi_sysfs.h
@@ -34,6 +34,7 @@ struct iscsi_auth_config;
struct flashnode_rec;
#define SCSI_MAX_STATE_VALUE 32
+#define ISCSID_RESP_POLL_TIMEOUT 60000
extern void free_transports(void);
extern char *iscsi_sysfs_get_iscsi_kernel_version(void);
diff --git a/usr/iscsid_req.c b/usr/iscsid_req.c
index 3bbf5b9..a3aba6d 100644
--- a/usr/iscsid_req.c
+++ b/usr/iscsid_req.c
@@ -156,7 +156,7 @@ int iscsid_response(int fd, iscsiadm_cmd_e cmd, iscsiadm_rsp_t *rsp,
if (!err) {
if (poll_wait)
continue;
- return ISCSI_ERR_ISCSID_NOTCONN;
+ return ISCSI_ERR_SESSION_NOT_CONNECTED;
} else if (err < 0) {
if (errno == EINTR)
continue;