[PATCH 13/17] libata-link: update ata_scsi_error() to handle PMP links
From: Tejun Heo <hidden>
Date: 2006-07-08 05:44:54
Subsystem:
scsi subsystem, the rest · Maintainers:
"James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
Update ata_scsi_error() to handle PMP links. As error conditions can occur on both host and PMP links, __ata_port_for_each_link() is used. Signed-off-by: Tejun Heo <redacted> --- drivers/scsi/libata-eh.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) b01c2d5a1be5b7b11edc375ac8477cf58993be00
diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index 7b4a7d8..6c473af 100644
--- a/drivers/scsi/libata-eh.c
+++ b/drivers/scsi/libata-eh.c@@ -278,15 +278,19 @@ void ata_scsi_error(struct Scsi_Host *ho repeat: /* invoke error handler */ if (ap->ops->error_handler) { + struct ata_link *link; + /* process port resume request */ ata_eh_handle_port_resume(ap); /* fetch & clear EH info */ spin_lock_irqsave(ap->lock, flags); - memset(&ap->link.eh_context, 0, sizeof(ap->link.eh_context)); - ap->link.eh_context.i = ap->link.eh_info; - memset(&ap->link.eh_info, 0, sizeof(ap->link.eh_info)); + __ata_port_for_each_link(link, ap) { + memset(&link->eh_context, 0, sizeof(link->eh_context)); + link->eh_context.i = link->eh_info; + memset(&link->eh_info, 0, sizeof(link->eh_info)); + } ap->pflags |= ATA_PFLAG_EH_IN_PROGRESS; ap->pflags &= ~ATA_PFLAG_EH_PENDING;
@@ -321,7 +325,8 @@ void ata_scsi_error(struct Scsi_Host *ho } /* this run is complete, make sure EH info is clear */ - memset(&ap->link.eh_info, 0, sizeof(ap->link.eh_info)); + __ata_port_for_each_link(link, ap) + memset(&link->eh_info, 0, sizeof(link->eh_info)); /* Clear host_eh_scheduled while holding ap->lock such * that if exception occurs after this point but
--
1.3.2