From:   John Garry <john.g.garry@oracle.com>
To:     jejb@linux.ibm.com, martin.petersen@oracle.com
Cc:     linux-scsi@vger.kernel.org, bvanassche@acm.org,
        linux-kernel@vger.kernel.org, dgilbert@interlog.com,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH RESEND v2 05/11] scsi: scsi_debug: Drop scsi_debug_target_reset() NULL pointer checks
Date:   Mon, 13 Mar 2023 09:31:08 +0000
Message-Id: <20230313093114.1498305-6-john.g.garry@oracle.com>
In-Reply-To: <20230313093114.1498305-1-john.g.garry@oracle.com>
References: <20230313093114.1498305-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6ZuEquCTA0j6GJflog5viVeQB8YPl+Z5j6Lj/95sSD280LwKHT40MkSn4MSH?=
 =?us-ascii?Q?ZcK09sfZh4SFLahKPFq9I8UurP90A7r/wYs3+OubgP3XUYTFRXzN6K1mxDXz?=
 =?us-ascii?Q?RWfg7dtuDdQ4gQNFOJQ6mddl6TeYi+hPpEaBbP9ve82iQbS4Lzx3BmLGLS0P?=
 =?us-ascii?Q?w83eXNImnUW4CNO6zh1Ag9lDTSvenD7SFLUbmsoLfbQFQ71kAU19KIk0/4vv?=
 =?us-ascii?Q?VeCAiz84CskSC5m870EZFjQ/XMXpC2QCppTJpaacO/jd2+Pq5iiYnj1tsebD?=
 =?us-ascii?Q?PGV3oL2Hlq1LfktPX1O754EJl+MiINm/hwIx0Q84ztXCJOVlhQijzgNxxQly?=
 =?us-ascii?Q?fa1nbGEA3t6Q/2REH1Oyz9kh9vcjK3wY4CDrlMLmBuG9eH2cgzQ8jpFxnrpi?=
 =?us-ascii?Q?7aYRjyM9wPlA778mnjsYWiAsRHgRRpkWOWXKgzjD7wdIyi+3c8nIctOsHPKl?=
 =?us-ascii?Q?aEAQzGVbVf8SjoQDn+FZFEAE4tF+o5zngo2jqb8qLi96E7HWbuKnZ1XJQcU1?=
 =?us-ascii?Q?6DEpk7mcH4XRzQBoV/3/NokYQxweqcz4/Ql04VDjGhhI9baZk9zZvoElb2z7?=
 =?us-ascii?Q?hWKd6NsxxFHYKMhhq4zGG2Qp3vbrtz6R9WtCUMFaSxSmfrnLNM41vWkCfPER?=
 =?us-ascii?Q?RNWne7Ro7rsAKmH8a+CgWsTEdJpPk+4mVGQMNWOT2Y8z4ZyMyjovsCdP2vqg?=
 =?us-ascii?Q?gQfR4MXVcqqVnbBDrJV0XOukrDZ0h6WiQ3eq4BJH4dwhYSFB0D0DUQht66i2?=
 =?us-ascii?Q?zxuUZ+sJp2LAiLcRBmqFknyRzoUonjywAdaMTChEX3cfsFhF3ZGDL2OrGrbT?=
 =?us-ascii?Q?9kdIcA2YXrHTsqdzSNgJHiBU0pQM6UHTgFrkqP28EKHW96bNEPpf0K+/OBfK?=
 =?us-ascii?Q?sZsDLQhSdxXK9JLVhtGtlkuzZg4aBt8GJBJ5nqF4lDKjMeedc+daIaFcsNWy?=
 =?us-ascii?Q?T3dLGnsA8gNFls1f7eabkF/odQ7oQIMJPYWnuWy0aLKBFwuwqbi3wPh3b0EC?=
 =?us-ascii?Q?TRXcy2THwZMBcE7HhL7kBDN2Dn+PCRpZj4d1XfjnTm7wHpPd7H8nODSNduWb?=
 =?us-ascii?Q?bbySnYyl14TUPEjwWRO4cZ+H9OBa/xBHtMYDl0b7pzLdS7zD3VJyhk4U2+FJ?=
 =?us-ascii?Q?E0FGghOebSSpDHrXVatKQneFvHEVwRD9nH+uJPzVSBpk6yKsmN7WKQtZU1fM?=
 =?us-ascii?Q?L1t01xI97rMoJUyf5Sn5+BzgKJDm/UiqQi/GztaYDSr0ASD5ojx4UrqBhGbu?=
 =?us-ascii?Q?pIvZ6IsPsO/vx3Y15YX47yoWnmob9lgMNSWyg3j9uJTAuSUTQIlNcpm6e8Om?=
 =?us-ascii?Q?Q6HtV+RBScjwswMGeRJONv4nyZGf6vunaq8+Jgw8X+a9HK8MCv3FVsYuFuTN?=
 =?us-ascii?Q?rs3GmVE/nUOPCy+KoaX0WKxc/+SBCGs67NKEJkfY4hW7L0goAC5KEqMQlILS?=
 =?us-ascii?Q?gRzjiNRgg0DwCxzV3W7l0q1DnvCrqWjsXE74P/zmjQGQR9AiisVUfhpOfyDk?=
 =?us-ascii?Q?lKNNM3gW7chnZAVLy80u8Zffe/EZXLgC2H0C2mmUIZ6QWng5F7ACGV9imhs7?=
 =?us-ascii?Q?6hMjab54kLjiNPWtQkSbimpTqiwMe9T6smrBVg+mkKJ9Xyqpmfcbm8kEn1g4?=
 =?us-ascii?Q?sA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: HYYtADIoBZUufLqXeakQ7qc0avkjXgn7aocsv72m1Lgt5e5Jrxu/ocmhM9vnjx/quRtfgo4lymtD3tUFAv9mZ6Pmn21jkN5fcoBFyr/j1hyKf8YkNf/waAa6Ln5ndbUDVZSsC1ftF2TIm9LuMgC/xUwXaVYBHIhrjvHhAi6DuGbavMYd97K2ri25EKs3BwfU+FQlh9BK8Ad6aq1vInzBm0SdDehftFmzkTAAAo4sicfr92973y9lwt3WHaNQJS86uju/U6wRJea2JMzXKCxhDPG0KZV5huoUlY5gPkmXlI6CwPf3PsEjFmbdflPd8HJ/MzGLuNhz6NUYM3Zq1pJ462jVZ5HxfQI9jobBPhjY/nviYtgXbH45aYDdbHQSNWC8jQkFPTcrIFyTRDM6z+Vi3ev4f3yFVFr+BySjCZZ1bd2matl6ZFWQXDLvq2jYYqr2QivWhuF0/3UQR9CyTNGZExy9VvwKDD9FKH0Ml+/JYeZGygZZSldpqmo4RMA48ect1vxmQLZUO3bJTLY5b9nE1N7kYniIUf6eHho4m1CXdoNXfys9bU+AtI08GTG6wyjKV5NEJhNDZm6UB//R8KOyB1u8mO+m/I+5gIjPmOo2YeBBdOZlsFm/zZyTLwq1pm4TV5DpYFvvb1wXTbwYqJEusimNai3mFyNWN7hLacgiP9FzRWyAmjVETk6oZQ2WeydybcAMVmPhDm5N/1xUeYgsdZa89MutNLWfdYiiUfUYagFHOqEbM60ZTNToxnQRqcEn9k1HFF2N7na335SPmZWy7Rt/b0MSc8hlBB674+XOcKKKx8RD3Gp1FowWprBZNcAWAUeUoYHqT593KoL9uSzssEXxSZEsOfNELEJS8S1BT5Y=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5d97eb86-3b83-4b81-cfe6-08db23a5becf
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 09:31:38.2641
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: K32TcK0+JUtJhwYux6BOsZtQeLalHNWhoH1b2/gzw8RCOs/AAJevLpPupEltHZHyOscTejl+4g7UsQ7YgSSMeA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB7048
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-03-13_02,2023-03-10_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 malwarescore=0
 mlxlogscore=999 mlxscore=0 suspectscore=0 bulkscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2303130077
X-Proofpoint-ORIG-GUID: B6paqOCrczLEfvQCI1X8yFgYJBfuEPMB
X-Proofpoint-GUID: B6paqOCrczLEfvQCI1X8yFgYJBfuEPMB
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The checks for SCSI cmnd, SCSI device, and SCSI host are unnecessary, so
drop them. Likewise, drop the NULL check for sdbg_host.

The only caller is scsi_try_target_reset() -> eh_target_reset_handler(),
and there those pointers cannot be NULL.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/scsi/scsi_debug.c | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 5b51c24f7d09..6364d6f08861 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5387,37 +5387,26 @@ static int scsi_debug_device_reset(struct scsi_cmnd *SCpnt)
 
 static int scsi_debug_target_reset(struct scsi_cmnd *SCpnt)
 {
-	struct sdebug_host_info *sdbg_host;
+	struct scsi_device *sdp = SCpnt->device;
+	struct sdebug_host_info *sdbg_host = shost_to_sdebug_host(sdp->host);
 	struct sdebug_dev_info *devip;
-	struct scsi_device *sdp;
-	struct Scsi_Host *hp;
 	int k = 0;
 
 	++num_target_resets;
-	if (!SCpnt)
-		goto lie;
-	sdp = SCpnt->device;
-	if (!sdp)
-		goto lie;
 	if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
 		sdev_printk(KERN_INFO, sdp, "%s\n", __func__);
-	hp = sdp->host;
-	if (!hp)
-		goto lie;
-	sdbg_host = shost_to_sdebug_host(hp);
-	if (sdbg_host) {
-		list_for_each_entry(devip,
-				    &sdbg_host->dev_info_list,
-				    dev_list)
-			if (devip->target == sdp->id) {
-				set_bit(SDEBUG_UA_BUS_RESET, devip->uas_bm);
-				++k;
-			}
+
+	list_for_each_entry(devip, &sdbg_host->dev_info_list, dev_list) {
+		if (devip->target == sdp->id) {
+			set_bit(SDEBUG_UA_BUS_RESET, devip->uas_bm);
+			++k;
+		}
 	}
+
 	if (SDEBUG_OPT_RESET_NOISE & sdebug_opts)
 		sdev_printk(KERN_INFO, sdp,
 			    "%s: %d device(s) found in target\n", __func__, k);
-lie:
+
 	return SUCCESS;
 }
 
-- 
2.35.3