Skip to content

Commit c34f95e

Browse files
mikechristiemartinkpetersen
authored andcommitted
scsi: iscsi: Move iscsi_ep_disconnect()
This patch moves iscsi_ep_disconnect() so it can be called earlier in the next patch. Link: https://lore.kernel.org/r/20220408001314.5014-2-michael.christie@oracle.com Tested-by: Manish Rangankar <mrangankar@marvell.com> Reviewed-by: Lee Duncan <lduncan@suse.com> Reviewed-by: Chris Leech <cleech@redhat.com> Signed-off-by: Mike Christie <michael.christie@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent bcd8a45 commit c34f95e

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

drivers/scsi/scsi_transport_iscsi.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2217,6 +2217,25 @@ static void iscsi_stop_conn(struct iscsi_cls_conn *conn, int flag)
22172217
ISCSI_DBG_TRANS_CONN(conn, "Stopping conn done.\n");
22182218
}
22192219

2220+
static void iscsi_ep_disconnect(struct iscsi_cls_conn *conn, bool is_active)
2221+
{
2222+
struct iscsi_cls_session *session = iscsi_conn_to_session(conn);
2223+
struct iscsi_endpoint *ep;
2224+
2225+
ISCSI_DBG_TRANS_CONN(conn, "disconnect ep.\n");
2226+
conn->state = ISCSI_CONN_FAILED;
2227+
2228+
if (!conn->ep || !session->transport->ep_disconnect)
2229+
return;
2230+
2231+
ep = conn->ep;
2232+
conn->ep = NULL;
2233+
2234+
session->transport->unbind_conn(conn, is_active);
2235+
session->transport->ep_disconnect(ep);
2236+
ISCSI_DBG_TRANS_CONN(conn, "disconnect ep done.\n");
2237+
}
2238+
22202239
static int iscsi_if_stop_conn(struct iscsi_transport *transport,
22212240
struct iscsi_uevent *ev)
22222241
{
@@ -2257,25 +2276,6 @@ static int iscsi_if_stop_conn(struct iscsi_transport *transport,
22572276
return 0;
22582277
}
22592278

2260-
static void iscsi_ep_disconnect(struct iscsi_cls_conn *conn, bool is_active)
2261-
{
2262-
struct iscsi_cls_session *session = iscsi_conn_to_session(conn);
2263-
struct iscsi_endpoint *ep;
2264-
2265-
ISCSI_DBG_TRANS_CONN(conn, "disconnect ep.\n");
2266-
conn->state = ISCSI_CONN_FAILED;
2267-
2268-
if (!conn->ep || !session->transport->ep_disconnect)
2269-
return;
2270-
2271-
ep = conn->ep;
2272-
conn->ep = NULL;
2273-
2274-
session->transport->unbind_conn(conn, is_active);
2275-
session->transport->ep_disconnect(ep);
2276-
ISCSI_DBG_TRANS_CONN(conn, "disconnect ep done.\n");
2277-
}
2278-
22792279
static void iscsi_cleanup_conn_work_fn(struct work_struct *work)
22802280
{
22812281
struct iscsi_cls_conn *conn = container_of(work, struct iscsi_cls_conn,

0 commit comments

Comments
 (0)