diff options
author | Mike Christie <michaelc@cs.wisc.edu> | 2009-11-11 17:34:33 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2009-12-04 13:01:36 -0500 |
commit | 3fe5ae8b4c4d3a82c755074878da7ddb9dde381e (patch) | |
tree | 2565bc75ba1ab288cff50d4290eca8312f87bb04 /drivers/scsi/scsi_transport_iscsi.c | |
parent | 5d12c05e29fc8715e3e32f57a8cced9290d87c55 (diff) |
[SCSI] libiscsi: add warm target reset tmf support
This implements warm target reset tmf support for
the scsi-ml target reset callback. Previously we would
just drop the session in that callback. This patch will
now try a target reset and if that fails drop the session.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/scsi_transport_iscsi.c')
-rw-r--r-- | drivers/scsi/scsi_transport_iscsi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index ad897df36615..dc04ca124a69 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <scsi/scsi_transport_iscsi.h> | 30 | #include <scsi/scsi_transport_iscsi.h> |
31 | #include <scsi/iscsi_if.h> | 31 | #include <scsi/iscsi_if.h> |
32 | 32 | ||
33 | #define ISCSI_SESSION_ATTRS 21 | 33 | #define ISCSI_SESSION_ATTRS 22 |
34 | #define ISCSI_CONN_ATTRS 13 | 34 | #define ISCSI_CONN_ATTRS 13 |
35 | #define ISCSI_HOST_ATTRS 4 | 35 | #define ISCSI_HOST_ATTRS 4 |
36 | 36 | ||
@@ -1759,6 +1759,7 @@ iscsi_session_attr(password_in, ISCSI_PARAM_PASSWORD_IN, 1); | |||
1759 | iscsi_session_attr(fast_abort, ISCSI_PARAM_FAST_ABORT, 0); | 1759 | iscsi_session_attr(fast_abort, ISCSI_PARAM_FAST_ABORT, 0); |
1760 | iscsi_session_attr(abort_tmo, ISCSI_PARAM_ABORT_TMO, 0); | 1760 | iscsi_session_attr(abort_tmo, ISCSI_PARAM_ABORT_TMO, 0); |
1761 | iscsi_session_attr(lu_reset_tmo, ISCSI_PARAM_LU_RESET_TMO, 0); | 1761 | iscsi_session_attr(lu_reset_tmo, ISCSI_PARAM_LU_RESET_TMO, 0); |
1762 | iscsi_session_attr(tgt_reset_tmo, ISCSI_PARAM_TGT_RESET_TMO, 0); | ||
1762 | iscsi_session_attr(ifacename, ISCSI_PARAM_IFACE_NAME, 0); | 1763 | iscsi_session_attr(ifacename, ISCSI_PARAM_IFACE_NAME, 0); |
1763 | iscsi_session_attr(initiatorname, ISCSI_PARAM_INITIATOR_NAME, 0) | 1764 | iscsi_session_attr(initiatorname, ISCSI_PARAM_INITIATOR_NAME, 0) |
1764 | 1765 | ||
@@ -2000,6 +2001,7 @@ iscsi_register_transport(struct iscsi_transport *tt) | |||
2000 | SETUP_SESSION_RD_ATTR(fast_abort, ISCSI_FAST_ABORT); | 2001 | SETUP_SESSION_RD_ATTR(fast_abort, ISCSI_FAST_ABORT); |
2001 | SETUP_SESSION_RD_ATTR(abort_tmo, ISCSI_ABORT_TMO); | 2002 | SETUP_SESSION_RD_ATTR(abort_tmo, ISCSI_ABORT_TMO); |
2002 | SETUP_SESSION_RD_ATTR(lu_reset_tmo,ISCSI_LU_RESET_TMO); | 2003 | SETUP_SESSION_RD_ATTR(lu_reset_tmo,ISCSI_LU_RESET_TMO); |
2004 | SETUP_SESSION_RD_ATTR(tgt_reset_tmo,ISCSI_TGT_RESET_TMO); | ||
2003 | SETUP_SESSION_RD_ATTR(ifacename, ISCSI_IFACE_NAME); | 2005 | SETUP_SESSION_RD_ATTR(ifacename, ISCSI_IFACE_NAME); |
2004 | SETUP_SESSION_RD_ATTR(initiatorname, ISCSI_INITIATOR_NAME); | 2006 | SETUP_SESSION_RD_ATTR(initiatorname, ISCSI_INITIATOR_NAME); |
2005 | SETUP_PRIV_SESSION_RD_ATTR(recovery_tmo); | 2007 | SETUP_PRIV_SESSION_RD_ATTR(recovery_tmo); |