diff --git a/include/iscsi-private.h b/include/iscsi-private.h index ca2ee36..e9e419c 100644 --- a/include/iscsi-private.h +++ b/include/iscsi-private.h @@ -371,10 +371,6 @@ uint32_t iscsi_itt_post_increment(struct iscsi_context *iscsi); void iscsi_timeout_scan(struct iscsi_context *iscsi); -int -iscsi_logout_async_internal(struct iscsi_context *iscsi, iscsi_command_cb cb, - void *private_data, uint32_t flags); - #ifdef __cplusplus } #endif diff --git a/lib/login.c b/lib/login.c index 33d20a2..835675f 100644 --- a/lib/login.c +++ b/lib/login.c @@ -1236,8 +1236,8 @@ iscsi_process_login_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, } int -iscsi_logout_async_internal(struct iscsi_context *iscsi, iscsi_command_cb cb, - void *private_data, uint32_t flags) +iscsi_logout_async(struct iscsi_context *iscsi, iscsi_command_cb cb, + void *private_data) { struct iscsi_pdu *pdu; @@ -1252,7 +1252,7 @@ iscsi_logout_async_internal(struct iscsi_context *iscsi, iscsi_command_cb cb, ISCSI_PDU_LOGOUT_REQUEST, ISCSI_PDU_LOGOUT_RESPONSE, iscsi_itt_post_increment(iscsi), - ISCSI_PDU_DROP_ON_RECONNECT|ISCSI_PDU_CORK_WHEN_SENT|flags); + ISCSI_PDU_DROP_ON_RECONNECT|ISCSI_PDU_CORK_WHEN_SENT); if (pdu == NULL) { iscsi_set_error(iscsi, "Out-of-memory: Failed to allocate " "logout pdu."); @@ -1285,13 +1285,6 @@ iscsi_logout_async_internal(struct iscsi_context *iscsi, iscsi_command_cb cb, return 0; } -int -iscsi_logout_async(struct iscsi_context *iscsi, iscsi_command_cb cb, - void *private_data) -{ - return iscsi_logout_async_internal(iscsi, cb, private_data, 0); -} - int iscsi_process_logout_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, struct iscsi_in_pdu *in) diff --git a/lib/pdu.c b/lib/pdu.c index 3d0b5c4..3c4bc3a 100644 --- a/lib/pdu.c +++ b/lib/pdu.c @@ -365,7 +365,7 @@ int iscsi_process_reject(struct iscsi_context *iscsi, if (reason == ISCSI_REJECT_WAITING_FOR_LOGOUT) { ISCSI_LOG(iscsi, 1, "target rejects request with reason: %s", iscsi_reject_reason_str(reason)); - iscsi_logout_async_internal(iscsi, iscsi_reconnect_after_logout, NULL, ISCSI_PDU_URGENT_DELIVERY); + iscsi_logout_async(iscsi, iscsi_reconnect_after_logout, NULL); return 0; } @@ -435,7 +435,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in) ISCSI_LOG(iscsi, 2, "dropping connection to fix errors with broken DELL Equallogic firmware 7.x"); return -1; } - iscsi_logout_async_internal(iscsi, iscsi_reconnect_after_logout, NULL, ISCSI_PDU_URGENT_DELIVERY); + iscsi_logout_async(iscsi, iscsi_reconnect_after_logout, NULL); return 0; case 0x2: ISCSI_LOG(iscsi, 2, "target will drop this connection. Time2Wait is %u seconds", param2); @@ -447,7 +447,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in) return 0; case 0x4: ISCSI_LOG(iscsi, 2, "target requests parameter renogitiation."); - iscsi_logout_async_internal(iscsi, iscsi_reconnect_after_logout, NULL, ISCSI_PDU_DROP_ON_RECONNECT); + iscsi_logout_async(iscsi, iscsi_reconnect_after_logout, NULL); return 0; default: ISCSI_LOG(iscsi, 1, "unhandled async event %u: param1 %u param2 %u param3 %u", event, param1, param2, param3);