mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-19 03:31:26 +00:00
Merge r5900 from the iser branch
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6274 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -86,8 +86,8 @@ static struct isert_conn_dev *get_available_dev(struct isert_listener_dev *dev,
|
||||
static void isert_del_timer(struct isert_conn_dev *dev)
|
||||
{
|
||||
if (dev->timer_active) {
|
||||
del_timer_sync(&dev->tmo_timer);
|
||||
dev->timer_active = 0;
|
||||
del_timer_sync(&dev->tmo_timer);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -239,6 +239,7 @@ int isert_conn_alloc(struct iscsi_session *session,
|
||||
goto cleanup_conn;
|
||||
|
||||
conn->rd_state = 1;
|
||||
isert_del_timer(dev);
|
||||
isert_dev_release(dev);
|
||||
isert_set_priv(conn, NULL);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user