From: Damien Le Moal <dlemoal@kernel.org>
To: linux-ide@vger.kernel.org, Niklas Cassel <cassel@kernel.org>
Subject: [PATCH 3/5] ata: libata-scsi: simplify ata_scsi_schedule_deferred_qc()
Date: Thu, 19 Feb 2026 15:23:10 +0900 [thread overview]
Message-ID: <20260219062312.1030867-4-dlemoal@kernel.org> (raw)
In-Reply-To: <20260219062312.1030867-1-dlemoal@kernel.org>
Use ata_qc_done() instead of calling ata_qc_free() and scsi_done()
directly.
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
---
drivers/ata/libata-scsi.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index c0dd75a0287c..41918e21d0f8 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1685,7 +1685,6 @@ void ata_scsi_deferred_qc_work(struct work_struct *work)
void ata_scsi_requeue_deferred_qc(struct ata_port *ap)
{
struct ata_queued_cmd *qc = ap->deferred_qc;
- struct scsi_cmnd *scmd;
lockdep_assert_held(ap->lock);
@@ -1697,11 +1696,9 @@ void ata_scsi_requeue_deferred_qc(struct ata_port *ap)
if (!qc)
return;
- scmd = qc->scsicmd;
ap->deferred_qc = NULL;
- ata_qc_free(qc);
- scmd->result = (DID_SOFT_ERROR << 16);
- scsi_done(scmd);
+ qc->scsicmd->result = (DID_SOFT_ERROR << 16);
+ ata_qc_done(qc);
}
static void ata_scsi_schedule_deferred_qc(struct ata_port *ap)
--
2.53.0
next prev parent reply other threads:[~2026-02-19 6:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-19 6:23 [PATCH 0/5] libata cleanups Damien Le Moal
2026-02-19 6:23 ` [PATCH 1/5] ata: libata-core: improve tag checks in ata_qc_issue() Damien Le Moal
2026-02-19 8:19 ` Hannes Reinecke
2026-02-19 6:23 ` [PATCH 2/5] ata: libata-sata: simplify ata_sas_queuecmd() Damien Le Moal
2026-02-19 8:20 ` Hannes Reinecke
2026-02-19 6:23 ` Damien Le Moal [this message]
2026-02-19 7:52 ` [PATCH 3/5] ata: libata-scsi: simplify ata_scsi_schedule_deferred_qc() Sergey Shtylyov
2026-02-19 8:21 ` Hannes Reinecke
2026-02-19 21:38 ` Damien Le Moal
2026-02-19 6:23 ` [PATCH 4/5] ata: libata-scsi: make ata_scsi_simulate() static Damien Le Moal
2026-02-19 8:22 ` Hannes Reinecke
2026-02-19 6:23 ` [PATCH 5/5] ata: libata-scsi: rename and improve ata_qc_done() Damien Le Moal
2026-02-19 8:26 ` Hannes Reinecke
2026-02-24 0:43 ` [PATCH 0/5] libata cleanups Damien Le Moal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260219062312.1030867-4-dlemoal@kernel.org \
--to=dlemoal@kernel.org \
--cc=cassel@kernel.org \
--cc=linux-ide@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox