Skip to content

Commit

Permalink
libata-link: update ata_scsi_error() to handle PMP links
Browse files Browse the repository at this point in the history
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 <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Oct 12, 2007
1 parent 8989805 commit cf1b86c
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions drivers/ata/libata-eh.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,8 @@ void ata_scsi_error(struct Scsi_Host *host)
repeat:
/* invoke error handler */
if (ap->ops->error_handler) {
struct ata_link *link;

/* kill fast drain timer */
del_timer_sync(&ap->fastdrain_timer);

Expand All @@ -372,9 +374,11 @@ void ata_scsi_error(struct Scsi_Host *host)
/* 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;
Expand Down Expand Up @@ -410,7 +414,8 @@ void ata_scsi_error(struct Scsi_Host *host)
}

/* 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
Expand Down

0 comments on commit cf1b86c

Please sign in to comment.