libata-link: implement ata_link_abort()

Implement ata_link_abort().

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 3da642bd2ee281e77c641aa55c16f72d372a93c8..dcae590cc9b4ac1863ec481c14d32216af18af2f 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -7050,6 +7050,7 @@ EXPORT_SYMBOL_GPL(ata_ehi_push_desc);
 EXPORT_SYMBOL_GPL(ata_ehi_clear_desc);
 EXPORT_SYMBOL_GPL(ata_eng_timeout);
 EXPORT_SYMBOL_GPL(ata_port_schedule_eh);
+EXPORT_SYMBOL_GPL(ata_link_abort);
 EXPORT_SYMBOL_GPL(ata_port_abort);
 EXPORT_SYMBOL_GPL(ata_port_freeze);
 EXPORT_SYMBOL_GPL(ata_eh_freeze_port);

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 733aa761f3eef94c2f628d3c3efefb417c7b7e1a..eb4c0593b406e6e7e10b09d40c8fbbbd69b2042e 100644 (file)
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -719,19 +719,7 @@ void ata_port_schedule_eh(struct ata_port *ap)
        DPRINTK("port EH scheduled\n");
 }
 
-/**
- *     ata_port_abort - abort all qc's on the port
- *     @ap: ATA port to abort qc's for
- *
- *     Abort all active qc's of @ap and schedule EH.
- *
- *     LOCKING:
- *     spin_lock_irqsave(host lock)
- *
- *     RETURNS:
- *     Number of aborted qc's.
- */
-int ata_port_abort(struct ata_port *ap)
+static int ata_do_link_abort(struct ata_port *ap, struct ata_link *link)
 {
        int tag, nr_aborted = 0;
 
@@ -743,7 +731,7 @@ int ata_port_abort(struct ata_port *ap)
        for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
                struct ata_queued_cmd *qc = ata_qc_from_tag(ap, tag);
 
-               if (qc) {
+               if (qc && (!link || qc->dev->link == link)) {
                        qc->flags |= ATA_QCFLAG_FAILED;
                        ata_qc_complete(qc);
                        nr_aborted++;
@@ -756,6 +744,40 @@ int ata_port_abort(struct ata_port *ap)
        return nr_aborted;
 }
 
+/**
+ *     ata_link_abort - abort all qc's on the link
+ *     @link: ATA link to abort qc's for
+ *
+ *     Abort all active qc's active on @link and schedule EH.
+ *
+ *     LOCKING:
+ *     spin_lock_irqsave(host lock)
+ *
+ *     RETURNS:
+ *     Number of aborted qc's.
+ */
+int ata_link_abort(struct ata_link *link)
+{
+       return ata_do_link_abort(link->ap, link);
+}
+
+/**
+ *     ata_port_abort - abort all qc's on the port
+ *     @ap: ATA port to abort qc's for
+ *
+ *     Abort all active qc's of @ap and schedule EH.
+ *
+ *     LOCKING:
+ *     spin_lock_irqsave(host_set lock)
+ *
+ *     RETURNS:
+ *     Number of aborted qc's.
+ */
+int ata_port_abort(struct ata_port *ap)
+{
+       return ata_do_link_abort(ap, NULL);
+}
+
 /**
  *     __ata_port_freeze - freeze port
  *     @ap: ATA port to freeze

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 74ced08d5989a74095ff12c1731407293f618a39..bfa155789993707863fc24273833d6b0713e5ef8 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -906,6 +906,7 @@ extern unsigned long ata_pci_default_filter(struct ata_device *, unsigned long);
 extern void ata_eng_timeout(struct ata_port *ap);
 
 extern void ata_port_schedule_eh(struct ata_port *ap);
+extern int ata_link_abort(struct ata_link *link);
 extern int ata_port_abort(struct ata_port *ap);
 extern int ata_port_freeze(struct ata_port *ap);