* [PATCH] pmcraid: add missing scsi_device_put() in pmcraid_eh_target_reset_handler()
@ 2023-10-17 7:21 Hannes Reinecke
2023-10-17 7:31 ` Christoph Hellwig
0 siblings, 1 reply; 6+ messages in thread
From: Hannes Reinecke @ 2023-10-17 7:21 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Christoph Hellwig, James Bottomley, linux-scsi, Hannes Reinecke
(Re-sending as a separate patch:)
When breaking out of a shost_for_each_device() loop one need to do
an explicit scsi_device_put(). And while at it convert to use
shost_priv() instead of a direct reference to ->hostdata.
Fixes: c2a14ab3b9b3 ("scsi: pmcraid: Select device in pmcraid_eh_target_reset_handler()")
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/pmcraid.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index a831b34c08a4..d946fb014474 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -2702,8 +2702,7 @@ static int pmcraid_reset_device(
unsigned long lock_flags;
u32 ioasc;
- pinstance =
- (struct pmcraid_instance *)scsi_dev->host->hostdata;
+ pinstance = shost_priv(scsi_dev->host);
res = scsi_dev->hostdata;
if (!res) {
@@ -3026,8 +3025,7 @@ static int pmcraid_eh_device_reset_handler(struct scsi_cmnd *scmd)
static int pmcraid_eh_bus_reset_handler(struct scsi_cmnd *scmd)
{
struct Scsi_Host *host = scmd->device->host;
- struct pmcraid_instance *pinstance =
- (struct pmcraid_instance *)host->hostdata;
+ struct pmcraid_instance *pinstance = shost_priv(host);
struct pmcraid_resource_entry *res = NULL;
struct pmcraid_resource_entry *temp;
struct scsi_device *sdev = NULL;
@@ -3066,6 +3064,7 @@ static int pmcraid_eh_target_reset_handler(struct scsi_cmnd *scmd)
{
struct Scsi_Host *shost = scmd->device->host;
struct scsi_device *scsi_dev = NULL, *tmp;
+ int ret;
shost_for_each_device(tmp, shost) {
if ((tmp->channel == scmd->device->channel) &&
@@ -3078,9 +3077,11 @@ static int pmcraid_eh_target_reset_handler(struct scsi_cmnd *scmd)
return FAILED;
sdev_printk(KERN_INFO, scsi_dev,
"Doing target reset due to an I/O command timeout.\n");
- return pmcraid_reset_device(scsi_dev,
- PMCRAID_INTERNAL_TIMEOUT,
- RESET_DEVICE_TARGET);
+ ret = pmcraid_reset_device(scsi_dev,
+ PMCRAID_INTERNAL_TIMEOUT,
+ RESET_DEVICE_TARGET);
+ scsi_device_put(scsi_dev);
+ return ret;
}
/**
--
2.35.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] pmcraid: add missing scsi_device_put() in pmcraid_eh_target_reset_handler()
2023-10-17 7:21 [PATCH] pmcraid: add missing scsi_device_put() in pmcraid_eh_target_reset_handler() Hannes Reinecke
@ 2023-10-17 7:31 ` Christoph Hellwig
0 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2023-10-17 7:31 UTC (permalink / raw)
To: Hannes Reinecke
Cc: Martin K. Petersen, Christoph Hellwig, James Bottomley,
linux-scsi
On Tue, Oct 17, 2023 at 09:21:45AM +0200, Hannes Reinecke wrote:
> (Re-sending as a separate patch:)
> When breaking out of a shost_for_each_device() loop one need to do
> an explicit scsi_device_put(). And while at it convert to use
> shost_priv() instead of a direct reference to ->hostdata.
This is still doing two entirely different things. Please send just
the trivial scsi_device_put patch as a fix, and the cleanup on top.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] pmcraid: add missing scsi_device_put() in pmcraid_eh_target_reset_handler()
@ 2023-10-23 7:29 Hannes Reinecke
2023-10-24 6:24 ` Christoph Hellwig
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Hannes Reinecke @ 2023-10-23 7:29 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Christoph Hellwig, James Bottomley, linux-scsi, Hannes Reinecke
When breaking out of a shost_for_each_device() loop one need to do
an explicit scsi_device_put().
Fixes: c2a14ab3b9b3 ("scsi: pmcraid: Select device in pmcraid_eh_target_reset_handler()")
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/pmcraid.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index a831b34c08a4..cd19e452c9ee 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -3066,6 +3066,7 @@ static int pmcraid_eh_target_reset_handler(struct scsi_cmnd *scmd)
{
struct Scsi_Host *shost = scmd->device->host;
struct scsi_device *scsi_dev = NULL, *tmp;
+ int ret;
shost_for_each_device(tmp, shost) {
if ((tmp->channel == scmd->device->channel) &&
@@ -3078,9 +3079,11 @@ static int pmcraid_eh_target_reset_handler(struct scsi_cmnd *scmd)
return FAILED;
sdev_printk(KERN_INFO, scsi_dev,
"Doing target reset due to an I/O command timeout.\n");
- return pmcraid_reset_device(scsi_dev,
- PMCRAID_INTERNAL_TIMEOUT,
- RESET_DEVICE_TARGET);
+ ret = pmcraid_reset_device(scsi_dev,
+ PMCRAID_INTERNAL_TIMEOUT,
+ RESET_DEVICE_TARGET);
+ scsi_device_put(scsi_dev);
+ return ret;
}
/**
--
2.35.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] pmcraid: add missing scsi_device_put() in pmcraid_eh_target_reset_handler()
2023-10-23 7:29 Hannes Reinecke
@ 2023-10-24 6:24 ` Christoph Hellwig
2023-10-25 2:24 ` Martin K. Petersen
2023-10-30 15:34 ` Martin K. Petersen
2 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2023-10-24 6:24 UTC (permalink / raw)
To: Hannes Reinecke
Cc: Martin K. Petersen, Christoph Hellwig, James Bottomley,
linux-scsi
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pmcraid: add missing scsi_device_put() in pmcraid_eh_target_reset_handler()
2023-10-23 7:29 Hannes Reinecke
2023-10-24 6:24 ` Christoph Hellwig
@ 2023-10-25 2:24 ` Martin K. Petersen
2023-10-30 15:34 ` Martin K. Petersen
2 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2023-10-25 2:24 UTC (permalink / raw)
To: Hannes Reinecke
Cc: Martin K. Petersen, Christoph Hellwig, James Bottomley,
linux-scsi
Hannes,
> When breaking out of a shost_for_each_device() loop one need to do an
> explicit scsi_device_put().
Applied to 6.7/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pmcraid: add missing scsi_device_put() in pmcraid_eh_target_reset_handler()
2023-10-23 7:29 Hannes Reinecke
2023-10-24 6:24 ` Christoph Hellwig
2023-10-25 2:24 ` Martin K. Petersen
@ 2023-10-30 15:34 ` Martin K. Petersen
2 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2023-10-30 15:34 UTC (permalink / raw)
To: Hannes Reinecke
Cc: Martin K . Petersen, Christoph Hellwig, James Bottomley,
linux-scsi
On Mon, 23 Oct 2023 09:29:57 +0200, Hannes Reinecke wrote:
> When breaking out of a shost_for_each_device() loop one need to do
> an explicit scsi_device_put().
>
>
Applied to 6.7/scsi-queue, thanks!
[1/1] pmcraid: add missing scsi_device_put() in pmcraid_eh_target_reset_handler()
https://git.kernel.org/mkp/scsi/c/0b1b4b04444f
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-10-30 15:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-17 7:21 [PATCH] pmcraid: add missing scsi_device_put() in pmcraid_eh_target_reset_handler() Hannes Reinecke
2023-10-17 7:31 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2023-10-23 7:29 Hannes Reinecke
2023-10-24 6:24 ` Christoph Hellwig
2023-10-25 2:24 ` Martin K. Petersen
2023-10-30 15:34 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox