diff options
| author | Mike Christie <michael.christie@oracle.com> | 2021-12-03 17:53:17 -0600 |
|---|---|---|
| committer | Mike Christie <michael.christie@oracle.com> | 2021-12-03 18:10:14 -0600 |
| commit | 67eb8b217daa87ef3f14a1d631eb0345ba870684 (patch) | |
| tree | aa628ad3ebf468e15c7717702fd1953f48f532ea | |
| parent | 98518390260056988803469105ed6fcccfbf650e (diff) | |
| download | open-iscsi-iscsistart-fixes.tar.gz | |
iscsid: add error code for req timeoutsiscsistart-fixes
ISCSI_ERR_SESSION_NOT_CONNECTED does not make sense to return when a
request times out if the request is not for login. This adds a new
error code.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
| -rw-r--r-- | include/iscsi_err.h | 2 | ||||
| -rw-r--r-- | usr/iscsid_req.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/iscsi_err.h b/include/iscsi_err.h index 04a8723..c31b05a 100644 --- a/include/iscsi_err.h +++ b/include/iscsi_err.h @@ -70,6 +70,8 @@ enum iscsi_error_list { ISCSI_ERR_CHILD_TERMINATED = 31, /* session likely not connected */ ISCSI_ERR_SESSION_NOT_CONNECTED = 32, + /* iscsid request timed out */ + ISCSI_ERR_REQ_TIMEDOUT = 33, /* Always last. Indicates end of error code space */ ISCSI_MAX_ERR_VAL, diff --git a/usr/iscsid_req.c b/usr/iscsid_req.c index 875c58f..f0882b5 100644 --- a/usr/iscsid_req.c +++ b/usr/iscsid_req.c @@ -149,7 +149,7 @@ int iscsid_response(int fd, iscsiadm_cmd_e cmd, iscsiadm_rsp_t *rsp, pfd.events = POLLIN; err = poll(&pfd, 1, timeout); if (!err) { - return ISCSI_ERR_SESSION_NOT_CONNECTED; + return ISCSI_ERR_REQ_TIMEDOUT; } else if (err < 0) { if (errno == EINTR) continue; |