diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-09-07 00:52:54 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-09-07 00:52:54 +0200 |
| commit | 17fa53da1239b8712c5cebbd72a74c713b6c2db9 (patch) | |
| tree | 8cf55e47ce681a6c899ccf8e06abeccecb20d38b /include/scsi | |
| parent | [SCSI] quieten messages on scsi_execute commands (diff) | |
| parent | [SCSI] unexport scsi_add_timer/scsi_delete_timer (diff) | |
| download | linux-17fa53da1239b8712c5cebbd72a74c713b6c2db9.tar.xz linux-17fa53da1239b8712c5cebbd72a74c713b6c2db9.zip | |
Merge by hand (conflicts in sd.c)
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_eh.h | 3 | ||||
| -rw-r--r-- | include/scsi/scsi_host.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h index b24d224281bd..fabd879c2f2e 100644 --- a/include/scsi/scsi_eh.h +++ b/include/scsi/scsi_eh.h @@ -35,9 +35,6 @@ static inline int scsi_sense_valid(struct scsi_sense_hdr *sshdr) } -extern void scsi_add_timer(struct scsi_cmnd *, int, - void (*)(struct scsi_cmnd *)); -extern int scsi_delete_timer(struct scsi_cmnd *); extern void scsi_report_bus_reset(struct Scsi_Host *, int); extern void scsi_report_device_reset(struct Scsi_Host *, int, int); extern int scsi_block_when_processing_errors(struct scsi_device *); diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index ac1b6125e3ae..916144be208b 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -467,12 +467,10 @@ struct Scsi_Host { struct task_struct * ehandler; /* Error recovery thread. */ struct semaphore * eh_wait; /* The error recovery thread waits on this. */ - struct completion * eh_notify; /* wait for eh to begin or end */ struct semaphore * eh_action; /* Wait for specific actions on the host. */ unsigned int eh_active:1; /* Indicates the eh thread is awake and active if this is true. */ - unsigned int eh_kill:1; /* set when killing the eh thread */ wait_queue_head_t host_wait; struct scsi_host_template *hostt; struct scsi_transport_template *transportt; |