public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] megaraid: fixup debug message in megaraid_abort_and_reset()
@ 2023-10-23  7:30 Hannes Reinecke
  2023-10-24  6:25 ` Christoph Hellwig
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Hannes Reinecke @ 2023-10-23  7:30 UTC (permalink / raw)
  To: Martin K. Petersen
  Cc: Christoph Hellwig, James Bottomley, linux-scsi, Hannes Reinecke,
	Dan Carpenter

Found by Smatch.

Fixes: 5bcd3bfbda02 ("scsi: megaraid: Pass in NULL scb for host reset")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 drivers/scsi/megaraid.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 329c3da88416..d59964ceef47 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1925,10 +1925,12 @@ megaraid_abort_and_reset(adapter_t *adapter, struct scsi_cmnd *cmd, int aor)
 	struct list_head	*pos, *next;
 	scb_t			*scb;
 
-	dev_warn(&adapter->dev->dev, "%s cmd=%x <c=%d t=%d l=%d>\n",
-	     (aor == SCB_ABORT)? "ABORTING":"RESET",
-	     cmd->cmnd[0], cmd->device->channel,
-	     cmd->device->id, (u32)cmd->device->lun);
+	if (aor == SCB_ABORT)
+		dev_warn(&adapter->dev->dev, "ABORTING cmd=%x <c=%d t=%d l=%d>\n",
+			 cmd->cmnd[0], cmd->device->channel,
+			 cmd->device->id, (u32)cmd->device->lun);
+	else
+		dev_warn(&adapter->dev->dev, "RESETTING\n");
 
 	if(list_empty(&adapter->pending_list))
 		return FAILED;
-- 
2.35.3


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] megaraid: fixup debug message in megaraid_abort_and_reset()
  2023-10-23  7:30 [PATCH] megaraid: fixup debug message in megaraid_abort_and_reset() Hannes Reinecke
@ 2023-10-24  6:25 ` Christoph Hellwig
  2023-10-25  2:41 ` Martin K. Petersen
  2023-10-30 15:34 ` Martin K. Petersen
  2 siblings, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2023-10-24  6:25 UTC (permalink / raw)
  To: Hannes Reinecke
  Cc: Martin K. Petersen, Christoph Hellwig, James Bottomley,
	linux-scsi, Dan Carpenter

On Mon, Oct 23, 2023 at 09:30:21AM +0200, Hannes Reinecke wrote:
> @@ -1925,10 +1925,12 @@ megaraid_abort_and_reset(adapter_t *adapter, struct scsi_cmnd *cmd, int aor)
>  	struct list_head	*pos, *next;
>  	scb_t			*scb;
>  
> -	dev_warn(&adapter->dev->dev, "%s cmd=%x <c=%d t=%d l=%d>\n",
> -	     (aor == SCB_ABORT)? "ABORTING":"RESET",
> -	     cmd->cmnd[0], cmd->device->channel,
> -	     cmd->device->id, (u32)cmd->device->lun);
> +	if (aor == SCB_ABORT)
> +		dev_warn(&adapter->dev->dev, "ABORTING cmd=%x <c=%d t=%d l=%d>\n",

Please avoid the overly long line here.

Otherwise looks good.


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] megaraid: fixup debug message in megaraid_abort_and_reset()
  2023-10-23  7:30 [PATCH] megaraid: fixup debug message in megaraid_abort_and_reset() Hannes Reinecke
  2023-10-24  6:25 ` Christoph Hellwig
@ 2023-10-25  2:41 ` Martin K. Petersen
  2023-10-30 15:34 ` Martin K. Petersen
  2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2023-10-25  2:41 UTC (permalink / raw)
  To: Hannes Reinecke
  Cc: Martin K. Petersen, Christoph Hellwig, James Bottomley,
	linux-scsi, Dan Carpenter


Hannes,

> Found by Smatch.

Applied to 6.7/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] megaraid: fixup debug message in megaraid_abort_and_reset()
  2023-10-23  7:30 [PATCH] megaraid: fixup debug message in megaraid_abort_and_reset() Hannes Reinecke
  2023-10-24  6:25 ` Christoph Hellwig
  2023-10-25  2:41 ` Martin K. Petersen
@ 2023-10-30 15:34 ` Martin K. Petersen
  2 siblings, 0 replies; 4+ 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, Dan Carpenter

On Mon, 23 Oct 2023 09:30:21 +0200, Hannes Reinecke wrote:

> Found by Smatch.
> 
> 

Applied to 6.7/scsi-queue, thanks!

[1/1] megaraid: fixup debug message in megaraid_abort_and_reset()
      https://git.kernel.org/mkp/scsi/c/f2d79aa16aee

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-10-30 15:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-23  7:30 [PATCH] megaraid: fixup debug message in megaraid_abort_and_reset() Hannes Reinecke
2023-10-24  6:25 ` Christoph Hellwig
2023-10-25  2:41 ` 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