From nobody Fri Dec 19 21:57:10 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08C5FC04A95 for ; Sat, 22 Oct 2022 08:19:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233615AbiJVISz (ORCPT ); Sat, 22 Oct 2022 04:18:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234113AbiJVIQQ (ORCPT ); Sat, 22 Oct 2022 04:16:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E59662CCA14; Sat, 22 Oct 2022 00:57:01 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 880B660B09; Sat, 22 Oct 2022 07:55:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75970C433D7; Sat, 22 Oct 2022 07:55:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425317; bh=DTxLj2qZk1GdpPUnu3tsMQyL5o4/02omjiqHhRkiaNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qlYtqOTxEd3MiE3SCOhHAqjLscaoiQP6U2dkNklQ1NjKToCjqfQ1NcYkGL0TOfHZO Udqkq8gblDaX912hdGJBF8XQSLre++fnCKjU49ZUV3eAQKCtAbqeNYVBDBlJXXoEFd MRjM6TqNb0KtDxDt+os9slNe8AbPACP3bh5GGa7o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiao Yang , Bart Van Assche , Leon Romanovsky , Sasha Levin Subject: [PATCH 5.19 431/717] RDMA/srp: Fix srp_abort() Date: Sat, 22 Oct 2022 09:25:10 +0200 Message-Id: <20221022072517.488627490@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bart Van Assche [ Upstream commit 6dbe4a8dead84de474483910b02ec9e6a10fc1a9 ] Fix the code for converting a SCSI command pointer into an SRP request pointer. Cc: Xiao Yang Fixes: ad215aaea4f9 ("RDMA/srp: Make struct scsi_cmnd and struct srp_reques= t adjacent") Signed-off-by: Bart Van Assche Link: https://lore.kernel.org/r/20220908233139.3042628-1-bvanassche@acm.org Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/ulp/srp/ib_srp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/s= rp/ib_srp.c index 3d9c108d73ad..c3fa65977b3e 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -2790,7 +2790,7 @@ static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, = u64 req_tag, u64 lun, static int srp_abort(struct scsi_cmnd *scmnd) { struct srp_target_port *target =3D host_to_target(scmnd->device->host); - struct srp_request *req =3D (struct srp_request *) scmnd->host_scribble; + struct srp_request *req =3D scsi_cmd_priv(scmnd); u32 tag; u16 ch_idx; struct srp_rdma_ch *ch; @@ -2798,8 +2798,6 @@ static int srp_abort(struct scsi_cmnd *scmnd) =20 shost_printk(KERN_ERR, target->scsi_host, "SRP abort called\n"); =20 - if (!req) - return SUCCESS; tag =3D blk_mq_unique_tag(scsi_cmd_to_rq(scmnd)); ch_idx =3D blk_mq_unique_tag_to_hwq(tag); if (WARN_ON_ONCE(ch_idx >=3D target->ch_count)) --=20 2.35.1