public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: Yongzhi Liu <hyperlyzcs@gmail.com>
To: skashyap@marvell.com, Markus.Elfring@web.de, njavali@marvell.com,
	martin.petersen@oracle.com,
	James.Bottomley@HansenPartnership.com
Cc: himanshu.madhani@oracle.com,
	GR-QLogic-Storage-Upstream@marvell.com,
	linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
	jitxie@tencent.com, huntazhang@tencent.com,
	Yongzhi Liu <hyperlyzcs@gmail.com>
Subject: [PATCH V4 2/2] scsi: qla2xxx: Use common error handling code in qla24xx_els_dcmd_iocb()
Date: Mon,  6 May 2024 20:38:35 +0800	[thread overview]
Message-ID: <20240506123835.17527-3-hyperlyzcs@gmail.com> (raw)
In-Reply-To: <20240506123835.17527-1-hyperlyzcs@gmail.com>

Add a jump target so that a bit of exception handling can be better reused
at the end of this function implementation.

Signed-off-by: Yongzhi Liu <hyperlyzcs@gmail.com>
Suggested-by: Markus Elfring <Markus.Elfring@web.de>
---
 drivers/scsi/qla2xxx/qla_iocb.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index faec66bd1951..a3a3904cbb47 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -2749,9 +2749,8 @@ qla24xx_els_dcmd_iocb(scsi_qla_host_t *vha, int els_opcode,
 			    GFP_KERNEL);
 
 	if (!elsio->u.els_logo.els_logo_pyld) {
-		/* ref: INIT */
-		kref_put(&sp->cmd_kref, qla2x00_sp_release);
-		return QLA_FUNCTION_FAILED;
+		rval = QLA_FUNCTION_FAILED;
+		goto put_ref;
 	}
 
 	memset(&logo_pyld, 0, sizeof(struct els_logo_payload));
@@ -2773,9 +2772,8 @@ qla24xx_els_dcmd_iocb(scsi_qla_host_t *vha, int els_opcode,
 
 	rval = qla2x00_start_sp(sp);
 	if (rval != QLA_SUCCESS) {
-		/* ref: INIT */
-		kref_put(&sp->cmd_kref, qla2x00_sp_release);
-		return QLA_FUNCTION_FAILED;
+		rval = QLA_FUNCTION_FAILED;
+		goto put_ref;
 	}
 
 	ql_dbg(ql_dbg_io, vha, 0x3074,
@@ -2784,7 +2782,7 @@ qla24xx_els_dcmd_iocb(scsi_qla_host_t *vha, int els_opcode,
 	    fcport->d_id.b.area, fcport->d_id.b.al_pa);
 
 	wait_for_completion(&elsio->u.els_logo.comp);
-
+put_ref:
 	/* ref: INIT */
 	kref_put(&sp->cmd_kref, qla2x00_sp_release);
 	return rval;
-- 
2.36.1


  parent reply	other threads:[~2024-05-06 12:39 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-25  9:37 [PATCH] scsi: qla2xxx: Fix double free of fcport in error handling path Yongzhi Liu
2024-04-25 11:31 ` Markus Elfring
2024-04-28 11:34   ` [PATCH V2] " Yongzhi Liu
2024-04-28 12:52     ` Markus Elfring
2024-04-29  5:12     ` Markus Elfring
2024-04-30  9:11       ` [PATCH V3 1/2] scsi: qla2xxx: Fix double free of fcport in qla24xx_els_dcmd_iocb Yongzhi Liu
2024-04-30  9:11         ` [PATCH V3 2/2] scsi: qla2xxx: Optimisation of exception handling " Yongzhi Liu
2024-04-30 11:21           ` Markus Elfring
2024-05-06 12:38             ` [PATCH V4 0/2] Bugfix and optimisation of exception handling Yongzhi Liu
2024-05-06 12:38               ` [PATCH V4 1/2] scsi: qla2xxx: Fix double free of fcport in qla24xx_els_dcmd_iocb() Yongzhi Liu
2024-05-06 12:38               ` Yongzhi Liu [this message]
2024-04-30  9:55         ` [PATCH V3 1/2] scsi: qla2xxx: Fix double free of fcport in qla24xx_els_dcmd_iocb Markus Elfring

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=20240506123835.17527-3-hyperlyzcs@gmail.com \
    --to=hyperlyzcs@gmail.com \
    --cc=GR-QLogic-Storage-Upstream@marvell.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=Markus.Elfring@web.de \
    --cc=himanshu.madhani@oracle.com \
    --cc=huntazhang@tencent.com \
    --cc=jitxie@tencent.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=njavali@marvell.com \
    --cc=skashyap@marvell.com \
    /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