Skip to content

Commit

Permalink
scsi: iscsi: Allow iscsi_if_stop_conn() to be called from kernel
Browse files Browse the repository at this point in the history
[ Upstream commit 3328333 ]

iscsi_if_stop_conn() is only called from the userspace interface but in a
subsequent commit we will want to call it from the kernel interface to
allow drivers like qedi to remove sessions from inside the kernel during
shutdown. This removes the iscsi_uevent code from iscsi_if_stop_conn() so we
can call it in a new helper.

Link: https://lore.kernel.org/r/20220616222738.5722-3-michael.christie@oracle.com
Tested-by: Nilesh Javali <njavali@marvell.com>
Reviewed-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
mikechristie authored and gregkh committed Aug 17, 2022
1 parent a78b882 commit 49f7414
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions drivers/scsi/scsi_transport_iscsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -2283,16 +2283,8 @@ static void iscsi_if_disconnect_bound_ep(struct iscsi_cls_conn *conn,
}
}

static int iscsi_if_stop_conn(struct iscsi_transport *transport,
struct iscsi_uevent *ev)
static int iscsi_if_stop_conn(struct iscsi_cls_conn *conn, int flag)
{
int flag = ev->u.stop_conn.flag;
struct iscsi_cls_conn *conn;

conn = iscsi_conn_lookup(ev->u.stop_conn.sid, ev->u.stop_conn.cid);
if (!conn)
return -EINVAL;

ISCSI_DBG_TRANS_CONN(conn, "iscsi if conn stop.\n");
/*
* If this is a termination we have to call stop_conn with that flag
Expand Down Expand Up @@ -3739,7 +3731,12 @@ static int iscsi_if_transport_conn(struct iscsi_transport *transport,
case ISCSI_UEVENT_DESTROY_CONN:
return iscsi_if_destroy_conn(transport, ev);
case ISCSI_UEVENT_STOP_CONN:
return iscsi_if_stop_conn(transport, ev);
conn = iscsi_conn_lookup(ev->u.stop_conn.sid,
ev->u.stop_conn.cid);
if (!conn)
return -EINVAL;

return iscsi_if_stop_conn(conn, ev->u.stop_conn.flag);
}

/*
Expand Down

0 comments on commit 49f7414

Please sign in to comment.