diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-26 20:43:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-26 20:43:53 -0700 |
| commit | d6e0677c193a70c22f75e6232a811bdff5948e6b (patch) | |
| tree | ef87c7fd0ebc9dcd7e8012e8c6a1705ef64fb25b /include | |
| parent | d0f06170da573a93b52b6d3049be42cd57038f4e (diff) | |
| parent | cb6d0f4487814ef0abd90c00df55d866fd6ce3f9 (diff) | |
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_devinfo.h | 1 | ||||
| -rw-r--r-- | include/scsi/scsi_host.h | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h index 21bf53ace663..edf56685b299 100644 --- a/include/scsi/scsi_devinfo.h +++ b/include/scsi/scsi_devinfo.h @@ -24,4 +24,5 @@ #define BLIST_REPORTLUN2 0x20000 /* try REPORT_LUNS even for SCSI-2 devs (if HBA supports more than 8 LUNs) */ #define BLIST_NOREPORTLUN 0x40000 /* don't try REPORT_LUNS scan (SCSI-3 devs) */ +#define BLIST_NOT_LOCKABLE 0x80000 /* don't use PREVENT-ALLOW commands */ #endif diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 21af949cfa58..2d3265c1cdd2 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -30,6 +30,12 @@ struct scsi_transport_template; #define DISABLE_CLUSTERING 0 #define ENABLE_CLUSTERING 1 +enum scsi_eh_timer_return { + EH_NOT_HANDLED, + EH_HANDLED, + EH_RESET_TIMER, +}; + struct scsi_host_template { struct module *module; @@ -126,6 +132,20 @@ struct scsi_host_template { int (* eh_host_reset_handler)(struct scsi_cmnd *); /* + * This is an optional routine to notify the host that the scsi + * timer just fired. The returns tell the timer routine what to + * do about this: + * + * EH_HANDLED: I fixed the error, please complete the command + * EH_RESET_TIMER: I need more time, reset the timer and + * begin counting again + * EH_NOT_HANDLED Begin normal error recovery + * + * Status: OPTIONAL + */ + enum scsi_eh_timer_return (* eh_timed_out)(struct scsi_cmnd *); + + /* * Old EH handlers, no longer used. Make them warn the user of old * drivers by using a wrong type * |