Skip to content

Commit

Permalink
[PATCH] libata: clear ap->active_tag atomically w.r.t. command comple…
Browse files Browse the repository at this point in the history
…tion

ap->active_tag was cleared in ata_qc_free().  This left ap->active_tag
dangling after ata_qc_complete().  Spurious interrupts inbetween could
incorrectly access the qc.  Clear active_tag in ata_qc_complete().
This change is necessary for later EH changes.

Signed-off-by: Tejun Heo <htejun@gmail.com>
  • Loading branch information
Tejun Heo committed May 15, 2006
1 parent f8c2c42 commit 7401abf
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4083,8 +4083,6 @@ void ata_qc_free(struct ata_queued_cmd *qc)
qc->flags = 0;
tag = qc->tag;
if (likely(ata_tag_valid(tag))) {
if (tag == ap->active_tag)
ap->active_tag = ATA_TAG_POISON;
qc->tag = ATA_TAG_POISON;
clear_bit(tag, &ap->qactive);
}
Expand All @@ -4098,6 +4096,9 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
if (likely(qc->flags & ATA_QCFLAG_DMAMAP))
ata_sg_clean(qc);

/* command should be marked inactive atomically with qc completion */
qc->ap->active_tag = ATA_TAG_POISON;

/* 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)
Expand Down

0 comments on commit 7401abf

Please sign in to comment.