[PATCH] libata-eh-fw: update ata_qc_from_tag() to enforce normal/EH qc ownership

[deliverable/linux.git] / drivers / scsi / libata-core.c

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 966abb5f423eee7ddec498276b831e9be5a697b7..1c34c1427aa3dda111cf88b5c292b35dc10f3572 100644 (file)
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1001,7 +1001,7 @@ unsigned ata_exec_internal(struct ata_device *dev,
 
        if (test_and_set_bit(tag, &ap->qactive))
                BUG();
-       qc = ata_qc_from_tag(ap, tag);
+       qc = __ata_qc_from_tag(ap, tag);
 
        qc->tag = tag;
        qc->scsicmd = NULL;
@@ -4042,7 +4042,7 @@ static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)
        /* the last tag is reserved for internal command. */
        for (i = 0; i < ATA_MAX_QUEUE - 1; i++)
                if (!test_and_set_bit(i, &ap->qactive)) {
-                       qc = ata_qc_from_tag(ap, i);
+                       qc = __ata_qc_from_tag(ap, i);
                        break;
                }