From 4eb4d11658b7276184019856e13a6d6d4a2456d4 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 27 Oct 2025 11:25:43 +0100 Subject: [SERVER] iscsi: Honor global _shutdown --- src/server/iscsi.c | 4 +--- src/server/iscsi.h | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'src') diff --git a/src/server/iscsi.c b/src/server/iscsi.c index c1fc01f..668b8a0 100644 --- a/src/server/iscsi.c +++ b/src/server/iscsi.c @@ -4211,7 +4211,7 @@ static int iscsi_connection_pdu_read(iscsi_connection *conn) break; } } - if ( conn->state == ISCSI_CONNECT_STATE_EXITING ) { + if ( conn->state == ISCSI_CONNECT_STATE_EXITING || _shutdown ) { return ISCSI_CONNECT_PDU_READ_ERR_FATAL; } } while ( prev_recv_state != conn->pdu_recv_state ); @@ -4264,8 +4264,6 @@ void iscsi_connection_handle(dnbd3_client_t *client, const dnbd3_request_t *requ conn->id = ++CONN_ID; while ( iscsi_connection_pdu_read( conn ) >= ISCSI_CONNECT_PDU_READ_OK ) { - if ( (conn->flags & ISCSI_CONNECT_FLAGS_STOPPED) != 0 ) - break; } iscsi_connection_destroy( conn ); diff --git a/src/server/iscsi.h b/src/server/iscsi.h index 622d49b..05f22e7 100644 --- a/src/server/iscsi.h +++ b/src/server/iscsi.h @@ -6094,9 +6094,6 @@ typedef struct iscsi_pdu iscsi_pdu; #define ISCSI_CONNECT_PDU_READ_ERR_LOGIN_PARAMETER_XCHG_NOT_ONCE (-4) -/// iSCSI connection flags: Stopped. -#define ISCSI_CONNECT_FLAGS_STOPPED (1 << 0) - /// iSCSI connection flags: Rejected. #define ISCSI_CONNECT_FLAGS_REJECTED (1 << 1) -- cgit v1.2.3-55-g7522