[PATCH] scsi: scsi_dh_alua: Use common code in alua_rtpg()
Markus Elfring <[email protected]> Thu, 18 Jun 2026 15:15:14 +0200
| Newsgroups | org.kernel.vger.kernel-janitors,org.kernel.vger.linux-kernel,org.kernel.vger.linux-scsi |
|---|---|
| Message-ID | <[email protected]> |
From: Markus Elfring <[email protected]> Date: Thu, 18 Jun 2026 14:54:13 +0200 Use an additional label so that a bit of common code can be better reused at the end of this function implementation. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <[email protected]> --- drivers/scsi/device_handler/scsi_dh_alua.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index 80ab0ff921d4..016150701064 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c @@ -582,8 +582,8 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) sdev_printk(KERN_INFO, sdev, "%s: ignoring rtpg result %d\n", ALUA_DH_NAME, retval); - kfree(buff); - return SCSI_DH_OK; + err = SCSI_DH_OK; + goto free_buff; } if (retval < 0 || !scsi_sense_valid(&sense_hdr)) { sdev_printk(KERN_INFO, sdev, @@ -632,15 +632,14 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) sdev_printk(KERN_ERR, sdev, "%s: rtpg retry\n", ALUA_DH_NAME); scsi_print_sense_hdr(sdev, ALUA_DH_NAME, &sense_hdr); - kfree(buff); - return err; + goto free_buff; } sdev_printk(KERN_ERR, sdev, "%s: rtpg failed\n", ALUA_DH_NAME); scsi_print_sense_hdr(sdev, ALUA_DH_NAME, &sense_hdr); - kfree(buff); pg->expiry = 0; - return SCSI_DH_IO; + err = SCSI_DH_IO; + goto free_buff; } len = get_unaligned_be32(&buff[0]) + 4; @@ -770,6 +769,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) break; } spin_unlock_irqrestore(&pg->lock, flags); +free_buff: kfree(buff); return err; } -- 2.54.0