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 /include/scsi | |
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 'include/scsi')
-rw-r--r-- | include/scsi/iscsi_if.h | 3 | ||||
-rw-r--r-- | include/scsi/libiscsi.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h index d67dda2b6aa0..66d377b9c72b 100644 --- a/include/scsi/iscsi_if.h +++ b/include/scsi/iscsi_if.h | |||
@@ -311,6 +311,8 @@ enum iscsi_param { | |||
311 | ISCSI_PARAM_IFACE_NAME, | 311 | ISCSI_PARAM_IFACE_NAME, |
312 | ISCSI_PARAM_ISID, | 312 | ISCSI_PARAM_ISID, |
313 | ISCSI_PARAM_INITIATOR_NAME, | 313 | ISCSI_PARAM_INITIATOR_NAME, |
314 | |||
315 | ISCSI_PARAM_TGT_RESET_TMO, | ||
314 | /* must always be last */ | 316 | /* must always be last */ |
315 | ISCSI_PARAM_MAX, | 317 | ISCSI_PARAM_MAX, |
316 | }; | 318 | }; |
@@ -350,6 +352,7 @@ enum iscsi_param { | |||
350 | #define ISCSI_IFACE_NAME (1ULL << ISCSI_PARAM_IFACE_NAME) | 352 | #define ISCSI_IFACE_NAME (1ULL << ISCSI_PARAM_IFACE_NAME) |
351 | #define ISCSI_ISID (1ULL << ISCSI_PARAM_ISID) | 353 | #define ISCSI_ISID (1ULL << ISCSI_PARAM_ISID) |
352 | #define ISCSI_INITIATOR_NAME (1ULL << ISCSI_PARAM_INITIATOR_NAME) | 354 | #define ISCSI_INITIATOR_NAME (1ULL << ISCSI_PARAM_INITIATOR_NAME) |
355 | #define ISCSI_TGT_RESET_TMO (1ULL << ISCSI_PARAM_TGT_RESET_TMO) | ||
353 | 356 | ||
354 | /* iSCSI HBA params */ | 357 | /* iSCSI HBA params */ |
355 | enum iscsi_host_param { | 358 | enum iscsi_host_param { |
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index 2db2bc26b1e9..7394e3bc8f4b 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h | |||
@@ -267,6 +267,7 @@ struct iscsi_session { | |||
267 | /* configuration */ | 267 | /* configuration */ |
268 | int abort_timeout; | 268 | int abort_timeout; |
269 | int lu_reset_timeout; | 269 | int lu_reset_timeout; |
270 | int tgt_reset_timeout; | ||
270 | int initial_r2t_en; | 271 | int initial_r2t_en; |
271 | unsigned max_r2t; | 272 | unsigned max_r2t; |
272 | int imm_data_en; | 273 | int imm_data_en; |