diff --git a/iscsi-scst/kernel/isert-scst/isert_login.c b/iscsi-scst/kernel/isert-scst/isert_login.c
index 3921728f1..428dd3268 100644
--- a/iscsi-scst/kernel/isert-scst/isert_login.c
+++ b/iscsi-scst/kernel/isert-scst/isert_login.c
@@ -488,7 +488,7 @@ void isert_connection_closed(struct iscsi_conn *iscsi_conn)
 void isert_connection_abort(struct iscsi_conn *iscsi_conn)
 {
 	struct isert_connection *isert_conn =
-		(struct isert_connection *)iscsi_conn;
+		container_of(iscsi_conn, struct isert_connection, iscsi);
 
 	TRACE_ENTRY();