From: John Garry <john.g.garry@oracle.com>
To: jejb@linux.ibm.com, martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
dgilbert@interlog.com, John Garry <john.g.garry@oracle.com>
Subject: [PATCH 03/11] scsi: scsi_debug: Drop scsi_debug_abort() NULL pointer checks
Date: Tue, 7 Mar 2023 10:55:47 +0000 [thread overview]
Message-ID: <20230307105555.3745277-4-john.g.garry@oracle.com> (raw)
In-Reply-To: <20230307105555.3745277-1-john.g.garry@oracle.com>
The SCSI cmnd pointer arg would never be NULL, so drop the check. In
addition, its SCSI device pointer would never be NULL.
The only caller is scsi_send_eh_cmnd() -> scsi_abort_eh_cmnd() ->
scsi_try_to_abort_cmd() -> scsi_try_to_abort_cmd(), and in the origin of
that chain those pointers cannot be NULL.
Signed-off-by: John Garry <john.g.garry@oracle.com>
---
drivers/scsi/scsi_debug.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 6d1c483a0a3b..4f971e8bfebc 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5362,13 +5362,13 @@ static int scsi_debug_abort(struct scsi_cmnd *SCpnt)
bool ok;
++num_aborts;
- if (SCpnt) {
- ok = stop_queued_cmnd(SCpnt);
- if (SCpnt->device && (SDEBUG_OPT_ALL_NOISE & sdebug_opts))
- sdev_printk(KERN_INFO, SCpnt->device,
- "%s: command%s found\n", __func__,
- ok ? "" : " not");
- }
+
+ ok = stop_queued_cmnd(SCpnt);
+ if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
+ sdev_printk(KERN_INFO, SCpnt->device,
+ "%s: command%s found\n", __func__,
+ ok ? "" : " not");
+
return SUCCESS;
}
--
2.35.3
next prev parent reply other threads:[~2023-03-07 10:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 10:55 [PATCH 00/11] scsi_debug: Some minor improvements John Garry
2023-03-07 10:55 ` [PATCH 01/11] scsi: scsi_debug: Don't hold driver host struct pointer in host->hostdata[] John Garry
2023-03-07 14:58 ` Bart Van Assche
2023-03-07 15:12 ` John Garry
2023-03-07 10:55 ` [PATCH 02/11] scsi: scsi_debug: Stop setting devip->sdbg_host twice John Garry
2023-03-07 10:55 ` John Garry [this message]
2023-03-07 10:55 ` [PATCH 04/11] scsi: scsi_debug: Drop scsi_debug_device_reset() NULL pointer checks John Garry
2023-03-07 10:55 ` [PATCH 05/11] scsi: scsi_debug: Drop scsi_debug_target_reset() " John Garry
2023-03-07 10:55 ` [PATCH 06/11] scsi: scsi_debug: Drop scsi_debug_bus_reset() " John Garry
2023-03-07 10:55 ` [PATCH 07/11] scsi: scsi_debug: Drop scsi_debug_host_reset() device NULL pointer check John Garry
2023-03-07 10:55 ` [PATCH 08/11] scsi: scsi_debug: Drop check for num_in_q exceeding queue depth John Garry
2023-03-07 10:55 ` [PATCH 09/11] scsi: scsi_debug: Drop sdebug_dev_info.num_in_q John Garry
2023-03-07 10:55 ` [PATCH 10/11] scsi: scsi_debug: Get command abort feature working again John Garry
2023-03-07 10:55 ` [PATCH 11/11] scsi: scsi_debug: Add poll mode deferred completions to statistics John Garry
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=20230307105555.3745277-4-john.g.garry@oracle.com \
--to=john.g.garry@oracle.com \
--cc=dgilbert@interlog.com \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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;
as well as URLs for NNTP newsgroup(s).