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

[PATCH] libata: rename ATA_FLAG_FLUSH_PIO_TASK to ATA_FLAG_FLUSH_PORT_TASK 



Rename ATA_FLAG_FLUSH_PIO_TASK to ATA_FLAG_FLUSH_PORT_TASK.

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

drivers/scsi/libata-core.c

+3 −3
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ void ata_port_queue_task(struct ata_port *ap, void (*fn)(void *), void *data, 
{

	int rc;



	if (ap->flags & ATA_FLAG_FLUSH_PIO_TASK)

	if (ap->flags & ATA_FLAG_FLUSH_PORT_TASK)

		return;



	PREPARE_WORK(&ap->port_task, fn, data);
@@ -773,7 +773,7 @@ void ata_port_flush_task(struct ata_port *ap) 
	DPRINTK("ENTER\n");



	spin_lock_irqsave(&ap->host_set->lock, flags);

	ap->flags |= ATA_FLAG_FLUSH_PIO_TASK;

	ap->flags |= ATA_FLAG_FLUSH_PORT_TASK;

	spin_unlock_irqrestore(&ap->host_set->lock, flags);



	DPRINTK("flush #1\n");
@@ -790,7 +790,7 @@ void ata_port_flush_task(struct ata_port *ap) 
	}



	spin_lock_irqsave(&ap->host_set->lock, flags);

	ap->flags &= ~ATA_FLAG_FLUSH_PIO_TASK;

	ap->flags &= ~ATA_FLAG_FLUSH_PORT_TASK;

	spin_unlock_irqrestore(&ap->host_set->lock, flags);



	DPRINTK("EXIT\n");

include/linux/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ enum { 
	ATA_FLAG_PIO_LBA48	= (1 << 13), /* Host DMA engine is LBA28 only */

	ATA_FLAG_IRQ_MASK	= (1 << 14), /* Mask IRQ in PIO xfers */



	ATA_FLAG_FLUSH_PIO_TASK	= (1 << 15), /* Flush PIO task */

	ATA_FLAG_FLUSH_PORT_TASK = (1 << 15), /* Flush port task */

	ATA_FLAG_IN_EH		= (1 << 16), /* EH in progress */



	ATA_QCFLAG_ACTIVE	= (1 << 1), /* cmd not yet ack'd to scsi lyer */