diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-01-22 09:57:27 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-01-22 09:57:27 -0800 |
| commit | 4b1a9a5e40210cb4a0687806d3b631f7db4b9b0e (patch) | |
| tree | 4f33f3af2e1ff163c6f4a1022d1d6b6be7b11547 /drivers/scsi/scsi_priv.h | |
| parent | dcaf9aed995c2b2a49fb86bbbcfa2f92c797ab5d (diff) | |
| parent | 3ce438df106826edde7ad724f3819716a3f0cf56 (diff) | |
Merge branch 'misc' into for-linus
Diffstat (limited to 'drivers/scsi/scsi_priv.h')
| -rw-r--r-- | drivers/scsi/scsi_priv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index 8f9a0cadc296..f079a598bed4 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h @@ -19,6 +19,7 @@ struct scsi_nl_hdr; * Scsi Error Handler Flags */ #define SCSI_EH_CANCEL_CMD 0x0001 /* Cancel this cmd */ +#define SCSI_EH_ABORT_SCHEDULED 0x0002 /* Abort has been scheduled */ #define SCSI_SENSE_VALID(scmd) \ (((scmd)->sense_buffer[0] & 0x70) == 0x70) @@ -66,6 +67,7 @@ extern int __init scsi_init_devinfo(void); extern void scsi_exit_devinfo(void); /* scsi_error.c */ +extern void scmd_eh_abort_handler(struct work_struct *work); extern enum blk_eh_timer_return scsi_times_out(struct request *req); extern int scsi_error_handler(void *host); extern int scsi_decide_disposition(struct scsi_cmnd *cmd); |