diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2018-05-11 12:51:04 -0600 |
|---|---|---|
| committer |   Tejun Heo <tj@kernel.org> | 2018-05-11 13:10:43 -0700 |
| commit | 4e5b6260cc9ba84ec127f948173ff7d87581f029 (patch) | |
| tree | 07b766f1a1164c347ef59ca14bed3e4b4d65b410 /drivers/ata/libata-core.c | |
| parent | libata: introduce notion of separate hardware tags (diff) | |
| download | linux-dev-4e5b6260cc9ba84ec127f948173ff7d87581f029.tar.xz linux-dev-4e5b6260cc9ba84ec127f948173ff7d87581f029.zip | |
libata: convert core and drivers to ->hw_tag usage
Anything that goes to the hardware should use ->hw_tag, anything
related to internal lookup should be using ->tag.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 4dc67c770429..1687e24d3633 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -5177,7 +5177,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc) /* command should be marked inactive atomically with qc completion */ if (ata_is_ncq(qc->tf.protocol)) { - link->sactive &= ~(1 << qc->tag); + link->sactive &= ~(1 << qc->hw_tag); if (!link->sactive) ap->nr_active_links--; } else { @@ -5405,16 +5405,16 @@ void ata_qc_issue(struct ata_queued_cmd *qc) WARN_ON_ONCE(ap->ops->error_handler && ata_tag_valid(link->active_tag)); if (ata_is_ncq(prot)) { - WARN_ON_ONCE(link->sactive & (1 << qc->tag)); + WARN_ON_ONCE(link->sactive & (1 << qc->hw_tag)); if (!link->sactive) ap->nr_active_links++; - link->sactive |= 1 << qc->tag; + link->sactive |= 1 << qc->hw_tag; } else { WARN_ON_ONCE(link->sactive); ap->nr_active_links++; - link->active_tag = qc->tag; + link->active_tag = qc->hw_tag; } qc->flags |= ATA_QCFLAG_ACTIVE; |