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 03/11] scsi: scsi_debug: Drop scsi_debug_abort() NULL pointer checks
Date:   Mon, 13 Mar 2023 09:31:06 +0000
Message-Id: <20230313093114.1498305-4-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?bGLkFR0EeGTGEmKg1x6eMCZSUh2JiuGWhcf0KUEV2eZ/8svKjaj3NMEuARXA?=
 =?us-ascii?Q?TiaGfMzJrqMsbZ5OdD8JQr9QRdg9l2jAXfph7crgAAf9sskPgZl2SQF8xhHv?=
 =?us-ascii?Q?C4W0JUEL7bbNsZbwhIFXPL9o6gaFX3Zc2MJQ0xZwgFDDcB8HwkAylHEwpb0B?=
 =?us-ascii?Q?aL/Yc3ZYH0vYyxlLGPRefHzl2AqUVeTI+RSIenEHTWeA6lByqNKvulAtg4xs?=
 =?us-ascii?Q?kNWi6B2/GGpZOhdeY0RpyBYzOrbpxhYm8mlRUVzF3GrUZmTaLTAtJl4SJ7cx?=
 =?us-ascii?Q?IF4NH4i8ak4Zj4KezQx198qxTHjMbi4TCffD9z1S6nvi49rJeY395ELHjnUp?=
 =?us-ascii?Q?I+e4pTU5daDYvLGU+VxaCZR5hhG7kcObCPXWHivEyYIVzSQTHlv7RLRqDfVs?=
 =?us-ascii?Q?twuOkohL/cwF2j6cgnPiIjqN3JraD2FZMHvgCvuubqODmFipw4dKTCUKUESJ?=
 =?us-ascii?Q?tkucU+OmNWijlwAmLTw9tioPa/d1n5/890CBclN0cGcpwWPCMZ3jmKpXb5of?=
 =?us-ascii?Q?7fkBybAuHCQe2KZIiFRAKVpAbpo6DhNdrnpwlnIgBlMzvSPKyqk4GkCG8nAY?=
 =?us-ascii?Q?djksRzAgi/SCxG/gvLrCoGwADzRrG6RB71MPp0wyQmHVB7ly8zIsuLHQDz8H?=
 =?us-ascii?Q?l+oPi6dUblG+Vdfg8xdupDD2/CGHOyKxs5E20uYAV5bPbRNLSgEGvzjQhNlE?=
 =?us-ascii?Q?jxqRdm2EEigxuDw8T867yb5gx7aJ5zWINRZgQOXFSGQBc6Dc/IZuQcJj7vEQ?=
 =?us-ascii?Q?FLreVKdLH7LMQwg+HLXOVacozitGl0w1E0YlQ+h2PfB/Q7YfqPfkJHqGfH16?=
 =?us-ascii?Q?bB9qqT0hSah3B5qjOa7VVINo6tPwjugIqdjPLBREE9fvw4o/YFCFOfWWllCw?=
 =?us-ascii?Q?VorOsdzsxqNSM+GmOusLuIkoWbzyGdcv41rJYK7Q2SPTYMoc2fBatpmPe5TW?=
 =?us-ascii?Q?TrDWdtmdnLSOCrcUnGZo7Ylw4J+7YdplH37h7TlEn+EjXWbWhiB/h/34gESa?=
 =?us-ascii?Q?6qg35WKzXqPmUSP7nEoNyKtSeT2itN1FdBJtb0tig3fTQgJu9c/d8RhcW/RC?=
 =?us-ascii?Q?19tzsLE+39ETnMxqsff6m5Mav3RgrerwwVimr58CHPyQl5XPju1z5n9JUCGw?=
 =?us-ascii?Q?W4MDuxJd/5E0hgQKvuieBk1ARgcnTQv0CtN658jDsMtL43C4F6H6n2EOQ/sc?=
 =?us-ascii?Q?Gvtt4s8z0tI3zYs9PhPlgjZRRTAovQKxuJIkyR0rPOY1Yksl+LwlzVkGu4D2?=
 =?us-ascii?Q?NAewtMYTiVcEP4B7/UQx8x7QpPTxMe33PItZ2qwuFowZFx64UZjEiY0kSy6X?=
 =?us-ascii?Q?aj7CbaTxytxNVi/yOzpMTEbh1gv0ksDOenThdt80Vz7SC9HHRMa+uf9AbIUY?=
 =?us-ascii?Q?0sMeh9npTFudvLYUm3QNZX8pthte+b07DXyOhBNQastjvRy8IkN9yTWSQ7Vq?=
 =?us-ascii?Q?JlOT9N7sjRLrGy58QaLCXPLanUjAmJOPDgdNdef70QVdo4VEnaRPUqpvCQw9?=
 =?us-ascii?Q?WkzGp13Nj2NaD6qVbCySVQmvIcPIuUQBe3HqBMzVjnGUmtOLHwi0ig3Fa2R1?=
 =?us-ascii?Q?XTuYiYqOtr+J1/znfVYbI6Vp6GNp3yov5GdoxYa8WuFZDghzR9upL2HCCXAa?=
 =?us-ascii?Q?Aw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: jn8ss1/aC7rAz+DYkJNiHdpCXRiQc1wd/ClxmP2uP/k2sBSmriC7Ce8T2nLaZ1tAX+5nfXTnt70lyo8DVxfI4fGr5D+UADgGN432zNCf/H6vqD6Q1MIag6gtpft4QUVzkx049+iWTbaj36KF+of3elf7174cWljhZT8Jg4IjRTmUCthyn+rFaNgs2oCpzc87TaTNvfiDa9UYicY0IzZNAY4bdsEUFKizxtOPfdZ0PaNBA4r7VGG/BaBggWD7nnGefA/gBHmiOAJGKxYQ1NOvLoHHbosLqHVQHxiJyWSTIv3eMGjebH4+lh6w1pNTiMnLkP7T9joqwrIg8cXSJG2PLh5HysPJatwQmfFDy0VBRl48hbRYDVTUd0+bkAYaHis4ZgzVIoAmLeJ3eZiv+bpYdYBMbI6K47l+sQE/ZWx66INgP50u02pZua8eGt1qTm1UFx78yOjdPOBXfJRQID8DDYLJH9vjwzSuMBqqQU+gDHgDpNHeitF0DmDQPbmNYAzogal+F23b7i/Gds6rfGdYWo6uGr8mZzMIdhgihxlCA/yISvR/r7JfPU84HNY+f7OJ65XG9g2Pz+BBO+ctFMpbFCOFS+nEMUwAQ24zxRV72iE1rrY98tBo1AEXUZd2BemNhBYu0qK6KJ5ckXZnouU4CR+DodFGvJVNw084jbfcf3/rtjGI0jdS7RBmc+vCQzliA44JfXbUvaNPIyfxE416GJXe80vALmWBRtX+CQLb7lSrAn1iyjFspxNw428AVSaqpF/fd4ll81EZRwxDtn8jUg3AvIw/yLXhmGZ5NCveuRwKyaVbVTj2JsdLTkeaKHl4mglPxnrt72gaX10Q4e2A5reSVvahuxNKN7O5TQJrn5g=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6435751c-812b-440b-ce19-08db23a5badd
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:31.5826
 (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: c02aMqbPmCaBdn8bb6zdFs4uBdQfupKaiXWPOxZ0EG0LkcEsmw6H0xFXqWSu5HCiCp7XgpmXbGzD/hSwFOF5tw==
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-GUID: zt0XdEMowFbyx7_w2JKmwrin3L_f3gBX
X-Proofpoint-ORIG-GUID: zt0XdEMowFbyx7_w2JKmwrin3L_f3gBX
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 4c60a055610a..2c2a41b99641 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5360,13 +5360,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