summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-02-20 23:27:06 +0900
committerJeff Garzik <jeff@garzik.org>2007-02-21 04:58:18 -0500
commitfcf1bf1584647f9fd864c193fee81840c4c5ce41 (patch)
tree6271f12b805d57edcb4ba908149c02e754c348e0 /drivers
parent6d1245bf294e9ea65b3717be9fa0338bfb6ff6c9 (diff)
downloadlinux-fcf1bf1584647f9fd864c193fee81840c4c5ce41.tar.gz
linux-fcf1bf1584647f9fd864c193fee81840c4c5ce41.tar.bz2
linux-fcf1bf1584647f9fd864c193fee81840c4c5ce41.zip
libata: fix ata_scmd_need_defer()
Fix ata_scmd_need_defer() such that... * whether NCQ is used or not is exactly determined using the same criteria as the issue path. * defer-check is performed in all cases. This fixes race condition where turning off NCQ on the fly causes non-NCQ commands sneak into NCQ phase. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/libata-scsi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 7bb782b5ce0c..aa6cb6dcec41 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1496,11 +1496,9 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
static int ata_scmd_need_defer(struct ata_device *dev, int is_io)
{
struct ata_port *ap = dev->ap;
+ int is_ncq = is_io && ata_ncq_enabled(dev);
- if (!(dev->flags & ATA_DFLAG_NCQ))
- return 0;
-
- if (is_io) {
+ if (is_ncq) {
if (!ata_tag_valid(ap->active_tag))
return 0;
} else {