Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 293002
b: refs/heads/master
c: 50824d6
h: refs/heads/master
v: v3
  • Loading branch information
Dan Williams authored and James Bottomley committed Feb 19, 2012
1 parent 2f0798d commit 36113fe
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 89d3cf6ac3cdc4f15a82709f8c78ed169a98be5b
refs/heads/master: 50824d6c5657ce340e3911171865a8d99fdd8eba
17 changes: 14 additions & 3 deletions trunk/drivers/scsi/libsas/sas_ata.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#include <linux/scatterlist.h>
#include <linux/slab.h>
#include <linux/async.h>

#include <scsi/sas_ata.h>
#include "sas_internal.h"
Expand Down Expand Up @@ -605,10 +606,21 @@ int sas_discover_sata(struct domain_device *dev)
return 0;
}

static void async_sas_ata_eh(void *data, async_cookie_t cookie)
{
struct domain_device *dev = data;
struct ata_port *ap = dev->sata_dev.ap;
struct sas_ha_struct *ha = dev->port->ha;

ata_port_printk(ap, KERN_DEBUG, "sas eh calling libata port error handler");
ata_scsi_port_error_handler(ha->core.shost, ap);
}

void sas_ata_strategy_handler(struct Scsi_Host *shost)
{
struct scsi_device *sdev;
struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost);
LIST_HEAD(async);

/* it's ok to defer revalidation events during ata eh, these
* disks are in one of three states:
Expand All @@ -622,14 +634,13 @@ void sas_ata_strategy_handler(struct Scsi_Host *shost)

shost_for_each_device(sdev, shost) {
struct domain_device *ddev = sdev_to_domain_dev(sdev);
struct ata_port *ap = ddev->sata_dev.ap;

if (!dev_is_sata(ddev))
continue;

ata_port_printk(ap, KERN_DEBUG, "sas eh calling libata port error handler");
ata_scsi_port_error_handler(shost, ap);
async_schedule_domain(async_sas_ata_eh, ddev, &async);
}
async_synchronize_full_domain(&async);

sas_enable_revalidation(sas_ha);
}
Expand Down

0 comments on commit 36113fe

Please sign in to comment.