]> err.no Git - linux-2.6/commitdiff
[PATCH] libata: Clear ATA_QCFLAG_ACTIVE flag before calling the completion callback
authorAlbert Lee <albertcc@tw.ibm.com>
Tue, 16 Aug 2005 06:25:38 +0000 (14:25 +0800)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 23 Aug 2005 05:03:38 +0000 (01:03 -0400)
Description:
  After calling the completion callback, the libata error handler might be
running and getting atapi sense data. Clearing the ATA_QCFLAG_ACTIVE flag
at this point might interfere with the libata error handler.

Changes:
   - Clear the ATA_QCFLAG_ACTIVE flag before calling the completion callback
     (and also before the error handler)
   - Add some comment

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
drivers/scsi/libata-core.c

index 3544f5d020c675e91079795f388ebd8235f8acc5..9a6aacf467b86807c417dfe210e2b69482d7a0bb 100644 (file)
@@ -3213,9 +3213,14 @@ void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
        if (likely(qc->flags & ATA_QCFLAG_DMAMAP))
                ata_sg_clean(qc);
 
+       /* atapi: mark qc as inactive to prevent the interrupt handler
+        * from completing the command twice later, before the error handler
+        * is called. (when rc != 0 and atapi request sense is needed)
+        */
+       qc->flags &= ~ATA_QCFLAG_ACTIVE;
+
        /* call completion callback */
        rc = qc->complete_fn(qc, drv_stat);
-       qc->flags &= ~ATA_QCFLAG_ACTIVE;
 
        /* if callback indicates not to complete command (non-zero),
         * return immediately