diff options
author | Mike Christie <michaelc@cs.wisc.edu> | 2007-12-13 12:43:29 -0600 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-11 18:28:33 -0600 |
commit | 2697478903d0ad8bdbf868b1346ae4b891662bb1 (patch) | |
tree | 8b40d774c0a6f33f9320333a20e08fa920f154fc /drivers/scsi/libiscsi.c | |
parent | bc436b278776d22eb10e7e75bf3e5257d14550a9 (diff) | |
download | linux-3.10-2697478903d0ad8bdbf868b1346ae4b891662bb1.tar.gz linux-3.10-2697478903d0ad8bdbf868b1346ae4b891662bb1.tar.bz2 linux-3.10-2697478903d0ad8bdbf868b1346ae4b891662bb1.zip |
[SCSI] libiscsi: fix shutdown
We were using the device delete sysfs file to remove each device
then logout. Now in 2.6.21 this will not work because
the sysfs delete file returns immediately and does not wait for
the device removal to complete. This causes a hang if a cache sync
is needed during shutdown. Before .21, that approach had other
problems, so this patch fixes the shutdown code so that we remove the target
and unbind the session before logging out and shut down the session
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/libiscsi.c')
-rw-r--r-- | drivers/scsi/libiscsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 441e351b445..5205ef2c29b 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -1662,7 +1662,7 @@ void iscsi_session_teardown(struct iscsi_cls_session *cls_session) struct iscsi_session *session = iscsi_hostdata(shost->hostdata); struct module *owner = cls_session->transport->owner; - iscsi_unblock_session(cls_session); + iscsi_remove_session(cls_session); scsi_remove_host(shost); iscsi_pool_free(&session->mgmtpool); @@ -1677,7 +1677,7 @@ void iscsi_session_teardown(struct iscsi_cls_session *cls_session) kfree(session->hwaddress); kfree(session->initiatorname); - iscsi_destroy_session(cls_session); + iscsi_free_session(cls_session); scsi_host_put(shost); module_put(owner); } |