From nobody Fri Dec 19 17:34:37 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 C69B3FA373E for ; Mon, 24 Oct 2022 21:50:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229604AbiJXVum (ORCPT ); Mon, 24 Oct 2022 17:50:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230265AbiJXVuM (ORCPT ); Mon, 24 Oct 2022 17:50:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1299340BC5; Mon, 24 Oct 2022 13:03:12 -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 ams.source.kernel.org (Postfix) with ESMTPS id 7F740B818CB; Mon, 24 Oct 2022 12:46:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C81B3C433D7; Mon, 24 Oct 2022 12:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615589; bh=9HuoijvBDqn1gZ2rgO3lr36HHwKPmIJy/R6qLMuXCIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZcVDzvgYXBaHQsENM6P+pihLN3FzrkAaycLOTB7hWVFDZ4zBpaeu1b7Dd80abeSJZ ZJwyhipoB18kz597YFcurHbyNimwZXhnH4zStYs/AxAVii5e6Ynv5K2m5KYkAWB8UG z3Kk2ZWcRV9tiwCz8twprb8ocinOpqF0tzQgC50I= 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.15 309/530] RDMA/srp: Fix srp_abort() Date: Mon, 24 Oct 2022 13:30:53 +0200 Message-Id: <20221024113059.043326221@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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 473b3a08cf96..2f4991cea98c 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -2783,7 +2783,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; @@ -2791,8 +2791,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