diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2012-01-11 12:08:36 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-02-29 15:23:24 -0600 |
| commit | d230ce691c7712c4f56ba3378d6d2f44628a49f1 (patch) | |
| tree | 5d8e334e322e26e807d5c186c9aa349c905c0c9d /include/scsi | |
| parent | 8abda4d28a55ecb91e39ceb5e3ee264c5a3cd1af (diff) | |
| download | op-kernel-dev-d230ce691c7712c4f56ba3378d6d2f44628a49f1.zip op-kernel-dev-d230ce691c7712c4f56ba3378d6d2f44628a49f1.tar.gz | |
[SCSI] libsas: fix mixed topology recovery
If we have a domain with sas and sata devices there may still be sas
recovery actions to take after peeling off the commands to send to
libata.
Reported-by: Andrzej Jakowski <andrzej.jakowski@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/sas_ata.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h index da3f377..cb724fd 100644 --- a/include/scsi/sas_ata.h +++ b/include/scsi/sas_ata.h @@ -41,8 +41,8 @@ int sas_ata_init_host_and_port(struct domain_device *found_dev, void sas_ata_task_abort(struct sas_task *task); void sas_ata_strategy_handler(struct Scsi_Host *shost); -int sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q, - struct list_head *done_q); +void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q, + struct list_head *done_q); void sas_probe_sata(struct work_struct *work); void sas_ata_schedule_reset(struct domain_device *dev); void sas_ata_wait_eh(struct domain_device *dev); @@ -66,10 +66,9 @@ static inline void sas_ata_strategy_handler(struct Scsi_Host *shost) { } -static inline int sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q, - struct list_head *done_q) +static inline void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q, + struct list_head *done_q) { - return 0; } static inline void sas_probe_sata(struct work_struct *work) |
