diff options
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/libsas.h | 4 | ||||
-rw-r--r-- | include/scsi/sas_ata.h | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 10ce74f589c5..814d8cb592ad 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h | |||
@@ -179,6 +179,7 @@ struct sata_device { | |||
179 | enum { | 179 | enum { |
180 | SAS_DEV_GONE, | 180 | SAS_DEV_GONE, |
181 | SAS_DEV_DESTROY, | 181 | SAS_DEV_DESTROY, |
182 | SAS_DEV_EH_PENDING, | ||
182 | }; | 183 | }; |
183 | 184 | ||
184 | struct domain_device { | 185 | struct domain_device { |
@@ -386,7 +387,8 @@ struct sas_ha_struct { | |||
386 | struct list_head defer_q; /* work queued while draining */ | 387 | struct list_head defer_q; /* work queued while draining */ |
387 | struct mutex drain_mutex; | 388 | struct mutex drain_mutex; |
388 | unsigned long state; | 389 | unsigned long state; |
389 | spinlock_t state_lock; | 390 | spinlock_t lock; |
391 | int eh_active; | ||
390 | 392 | ||
391 | struct mutex disco_mutex; | 393 | struct mutex disco_mutex; |
392 | 394 | ||
diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h index 77670e823ed8..2dfbdaa0b34a 100644 --- a/include/scsi/sas_ata.h +++ b/include/scsi/sas_ata.h | |||
@@ -45,6 +45,7 @@ void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q, | |||
45 | void sas_ata_schedule_reset(struct domain_device *dev); | 45 | void sas_ata_schedule_reset(struct domain_device *dev); |
46 | void sas_ata_wait_eh(struct domain_device *dev); | 46 | void sas_ata_wait_eh(struct domain_device *dev); |
47 | void sas_probe_sata(struct asd_sas_port *port); | 47 | void sas_probe_sata(struct asd_sas_port *port); |
48 | void sas_ata_end_eh(struct ata_port *ap); | ||
48 | #else | 49 | #else |
49 | 50 | ||
50 | 51 | ||
@@ -85,6 +86,10 @@ static inline int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy | |||
85 | { | 86 | { |
86 | return 0; | 87 | return 0; |
87 | } | 88 | } |
89 | |||
90 | static inline void sas_ata_end_eh(struct ata_port *ap) | ||
91 | { | ||
92 | } | ||
88 | #endif | 93 | #endif |
89 | 94 | ||
90 | #endif /* _SAS_ATA_H_ */ | 95 | #endif /* _SAS_ATA_H_ */ |