diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-09 20:11:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-09 20:11:09 -0700 |
| commit | d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14 (patch) | |
| tree | 8e55d9d74f46ce13e4299d23c23c72b9306798c1 /drivers/scsi/libiscsi.c | |
| parent | d0e60206bea2dec46c0a28fd6b116646aa67c5ae (diff) | |
| parent | 529a86e063e9ff625c4ff247d8aa17d8072444fb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/scsi/libiscsi.c')
| -rw-r--r-- | drivers/scsi/libiscsi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index bd4605a34f54..c62e8d111fd9 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -2851,9 +2851,6 @@ EXPORT_SYMBOL_GPL(iscsi_session_setup); /** * iscsi_session_teardown - destroy session, host, and cls_session * @cls_session: iscsi session - * - * The driver must have called iscsi_remove_session before - * calling this. */ void iscsi_session_teardown(struct iscsi_cls_session *cls_session) { @@ -2863,6 +2860,8 @@ void iscsi_session_teardown(struct iscsi_cls_session *cls_session) iscsi_pool_free(&session->cmdpool); + iscsi_remove_session(cls_session); + kfree(session->password); kfree(session->password_in); kfree(session->username); @@ -2877,7 +2876,8 @@ void iscsi_session_teardown(struct iscsi_cls_session *cls_session) kfree(session->portal_type); kfree(session->discovery_parent_type); - iscsi_destroy_session(cls_session); + iscsi_free_session(cls_session); + iscsi_host_dec_session_cnt(shost); module_put(owner); } |