linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] scsi: qla2xxx: check correct variable in qla24xx_async_gffid()
@ 2022-06-17  6:00 Dan Carpenter
  2022-06-22  1:28 ` Martin K. Petersen
  0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2022-06-17  6:00 UTC (permalink / raw)
  To: Nilesh Javali, Quinn Tran
  Cc: GR-QLogic-Storage-Upstream, James E.J. Bottomley,
	Martin K. Petersen, linux-scsi, kernel-janitors

There is a copy and paste bug here.  It should check ".rsp" instead of
".req".

Fixes: 9c40c36e75ff ("scsi: qla2xxx: edif: Reduce Initiator-Initiator thrashing")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/scsi/qla2xxx/qla_gs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 350d7c22ac79..cd0c3c703786 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3389,7 +3389,7 @@ int qla24xx_async_gffid(scsi_qla_host_t *vha, fc_port_t *fcport, bool wait)
 				sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
 				&sp->u.iocb_cmd.u.ctarg.rsp_dma,
 	    GFP_KERNEL);
-	if (!sp->u.iocb_cmd.u.ctarg.req) {
+	if (!sp->u.iocb_cmd.u.ctarg.rsp) {
 		ql_log(ql_log_warn, vha, 0xd041,
 		       "%s: Failed to allocate ct_sns request.\n",
 		       __func__);
-- 
2.35.1


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

* Re: [PATCH] scsi: qla2xxx: check correct variable in qla24xx_async_gffid()
  2022-06-17  6:00 [PATCH] scsi: qla2xxx: check correct variable in qla24xx_async_gffid() Dan Carpenter
@ 2022-06-22  1:28 ` Martin K. Petersen
  2022-06-22  6:21   ` [PATCH v2] scsi: qla2xxx: " Dan Carpenter
  0 siblings, 1 reply; 5+ messages in thread
From: Martin K. Petersen @ 2022-06-22  1:28 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Nilesh Javali, Quinn Tran, GR-QLogic-Storage-Upstream,
	James E.J. Bottomley, Martin K. Petersen, linux-scsi,
	kernel-janitors


Dan,

> There is a copy and paste bug here.  It should check ".rsp" instead of
> ".req".

> -	if (!sp->u.iocb_cmd.u.ctarg.req) {
> +	if (!sp->u.iocb_cmd.u.ctarg.rsp) {
>  		ql_log(ql_log_warn, vha, 0xd041,
>  		       "%s: Failed to allocate ct_sns request.\n",
>  		       __func__);

I wonder if the log message should be adjusted to say "ct_sns response"
or something to that effect?

-- 
Martin K. Petersen	Oracle Linux Engineering

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

* [PATCH v2] scsi: qla2xxx: scsi: qla2xxx: check correct variable in qla24xx_async_gffid()
  2022-06-22  1:28 ` Martin K. Petersen
@ 2022-06-22  6:21   ` Dan Carpenter
  2022-07-07 20:36     ` Martin K. Petersen
  2022-07-14  4:22     ` Martin K. Petersen
  0 siblings, 2 replies; 5+ messages in thread
From: Dan Carpenter @ 2022-06-22  6:21 UTC (permalink / raw)
  To: Nilesh Javali, Martin K. Petersen, Quinn Tran
  Cc: GR-QLogic-Storage-Upstream, James E.J. Bottomley, linux-scsi,
	kernel-janitors

There is a copy and paste bug here.  It should check ".rsp" instead of
".req".  The error message is copy and pasted as well so update that too.

Fixes: 9c40c36e75ff ("scsi: qla2xxx: edif: Reduce Initiator-Initiator thrashing")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: Update the error message as well

 drivers/scsi/qla2xxx/qla_gs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 68fb91ef380a..dff06a3255d6 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3389,9 +3389,9 @@ int qla24xx_async_gffid(scsi_qla_host_t *vha, fc_port_t *fcport, bool wait)
 				sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
 				&sp->u.iocb_cmd.u.ctarg.rsp_dma,
 	    GFP_KERNEL);
-	if (!sp->u.iocb_cmd.u.ctarg.req) {
+	if (!sp->u.iocb_cmd.u.ctarg.rsp) {
 		ql_log(ql_log_warn, vha, 0xd041,
-		       "%s: Failed to allocate ct_sns request.\n",
+		       "%s: Failed to allocate ct_sns response.\n",
 		       __func__);
 		goto done_free_sp;
 	}
-- 
2.35.1


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

* Re: [PATCH v2] scsi: qla2xxx: scsi: qla2xxx: check correct variable in qla24xx_async_gffid()
  2022-06-22  6:21   ` [PATCH v2] scsi: qla2xxx: " Dan Carpenter
@ 2022-07-07 20:36     ` Martin K. Petersen
  2022-07-14  4:22     ` Martin K. Petersen
  1 sibling, 0 replies; 5+ messages in thread
From: Martin K. Petersen @ 2022-07-07 20:36 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Nilesh Javali, Martin K. Petersen, Quinn Tran,
	GR-QLogic-Storage-Upstream, James E.J. Bottomley, linux-scsi,
	kernel-janitors


Dan,

> There is a copy and paste bug here.  It should check ".rsp" instead of
> ".req".  The error message is copy and pasted as well so update that
> too.

Applied to 5.20/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

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

* Re: [PATCH v2] scsi: qla2xxx: scsi: qla2xxx: check correct variable in qla24xx_async_gffid()
  2022-06-22  6:21   ` [PATCH v2] scsi: qla2xxx: " Dan Carpenter
  2022-07-07 20:36     ` Martin K. Petersen
@ 2022-07-14  4:22     ` Martin K. Petersen
  1 sibling, 0 replies; 5+ messages in thread
From: Martin K. Petersen @ 2022-07-14  4:22 UTC (permalink / raw)
  To: Quinn Tran, Dan Carpenter, Nilesh Javali
  Cc: Martin K . Petersen, linux-scsi, kernel-janitors,
	James E.J. Bottomley, GR-QLogic-Storage-Upstream

On Wed, 22 Jun 2022 09:21:55 +0300, Dan Carpenter wrote:

> There is a copy and paste bug here.  It should check ".rsp" instead of
> ".req".  The error message is copy and pasted as well so update that too.
> 
> 

Applied to 5.20/scsi-queue, thanks!

[1/1] scsi: qla2xxx: scsi: qla2xxx: check correct variable in qla24xx_async_gffid()
      https://git.kernel.org/mkp/scsi/c/7c33e477bd88

-- 
Martin K. Petersen	Oracle Linux Engineering

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

end of thread, other threads:[~2022-07-14  4:22 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-17  6:00 [PATCH] scsi: qla2xxx: check correct variable in qla24xx_async_gffid() Dan Carpenter
2022-06-22  1:28 ` Martin K. Petersen
2022-06-22  6:21   ` [PATCH v2] scsi: qla2xxx: " Dan Carpenter
2022-07-07 20:36     ` Martin K. Petersen
2022-07-14  4:22     ` 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;
as well as URLs for NNTP newsgroup(s).