Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbd82616 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata-link: implement ata_link_abort() 



Implement ata_link_abort().

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 4fb37a25

drivers/ata/libata-core.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/ata/libata-eh.c

+36 −14
Original line number Diff line number Diff line
@@ -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

include/linux/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -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);