mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +00:00
scsi: iscsi: Add iscsi_cls_conn refcount helpers
[ Upstream commit b1d19e8c92
]
There are a couple places where we could free the iscsi_cls_conn while it's
still in use. This adds some helpers to get/put a refcount on the struct
and converts an exiting user. Subsequent commits will then use the helpers
to fix 2 bugs in the eh code.
Link: https://lore.kernel.org/r/20210525181821.7617-11-michael.christie@oracle.com
Reviewed-by: Lee Duncan <lduncan@suse.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>
This commit is contained in:
parent
2376e2ad33
commit
7b5ddec4b8
3 changed files with 16 additions and 5 deletions
|
@ -1385,7 +1385,6 @@ void iscsi_session_failure(struct iscsi_session *session,
|
|||
enum iscsi_err err)
|
||||
{
|
||||
struct iscsi_conn *conn;
|
||||
struct device *dev;
|
||||
|
||||
spin_lock_bh(&session->frwd_lock);
|
||||
conn = session->leadconn;
|
||||
|
@ -1394,10 +1393,8 @@ void iscsi_session_failure(struct iscsi_session *session,
|
|||
return;
|
||||
}
|
||||
|
||||
dev = get_device(&conn->cls_conn->dev);
|
||||
iscsi_get_conn(conn->cls_conn);
|
||||
spin_unlock_bh(&session->frwd_lock);
|
||||
if (!dev)
|
||||
return;
|
||||
/*
|
||||
* if the host is being removed bypass the connection
|
||||
* recovery initialization because we are going to kill
|
||||
|
@ -1407,7 +1404,7 @@ void iscsi_session_failure(struct iscsi_session *session,
|
|||
iscsi_conn_error_event(conn->cls_conn, err);
|
||||
else
|
||||
iscsi_conn_failure(conn, err);
|
||||
put_device(dev);
|
||||
iscsi_put_conn(conn->cls_conn);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(iscsi_session_failure);
|
||||
|
||||
|
|
|
@ -2306,6 +2306,18 @@ int iscsi_destroy_conn(struct iscsi_cls_conn *conn)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(iscsi_destroy_conn);
|
||||
|
||||
void iscsi_put_conn(struct iscsi_cls_conn *conn)
|
||||
{
|
||||
put_device(&conn->dev);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(iscsi_put_conn);
|
||||
|
||||
void iscsi_get_conn(struct iscsi_cls_conn *conn)
|
||||
{
|
||||
get_device(&conn->dev);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(iscsi_get_conn);
|
||||
|
||||
/*
|
||||
* iscsi interface functions
|
||||
*/
|
||||
|
|
|
@ -436,6 +436,8 @@ extern void iscsi_remove_session(struct iscsi_cls_session *session);
|
|||
extern void iscsi_free_session(struct iscsi_cls_session *session);
|
||||
extern struct iscsi_cls_conn *iscsi_create_conn(struct iscsi_cls_session *sess,
|
||||
int dd_size, uint32_t cid);
|
||||
extern void iscsi_put_conn(struct iscsi_cls_conn *conn);
|
||||
extern void iscsi_get_conn(struct iscsi_cls_conn *conn);
|
||||
extern int iscsi_destroy_conn(struct iscsi_cls_conn *conn);
|
||||
extern void iscsi_unblock_session(struct iscsi_cls_session *session);
|
||||
extern void iscsi_block_session(struct iscsi_cls_session *session);
|
||||
|
|
Loading…
Reference in a new issue