Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7445998rwi; Mon, 24 Oct 2022 14:58:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4bAdQjF50uC62b43npnk90jwbkBWHitN0UvNCN/W/A5SELALZWqJW5U5AohTaBZ0SGTZ7L X-Received: by 2002:a17:902:e552:b0:179:e795:71c5 with SMTP id n18-20020a170902e55200b00179e79571c5mr35340533plf.57.1666648708991; Mon, 24 Oct 2022 14:58:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666648708; cv=none; d=google.com; s=arc-20160816; b=rAjOgsduAJKx4iwTXt+Pl3CjoswzyOnaU8xTxLRDGLQxGk9995MfwdG2cKnM6SoibB Lrc8CzaFdd8YE4/zirAbyS4HFAEDVQun20nCNqz8Ns+SzwFLXk+sydySJB4NfH6dobw0 Ny2GZZS246Ps8A8VTK07iF9SNElBSSH+WgE2GRri57cj++M9EqVwpDcR/Es6rmF7jLFr GIWWpUZYy8tMq2BrIGe7FiZo0D6IHqDFsqN176JmGij/cEbyb6DRHh5yyMt8W+TwmZTZ UB2HNeIp+fH6tMtxjtoXzN4zaIlaRpSCM390hEq2TjLvJrHTYl8walWfkuPPH2PggZe/ 8LYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BGwPaC3A5oNlUIqsruzDsC8lTx3Nhu5IDHya6U/cts8=; b=rvB4SCAwxKW4cioiv9FbHM5UNDz4zfndiWuhSqsgIH0Fk8g9WCN7I595uSjXX4qzOh 3UeskMZsPhGhT5TjiltRPvRxZu25ZqCtKTNO4Qd+hwea8/DZQxRA/r4lTSjLCJqZPd2G JOZhSvV8hNi/rLoWhB8KLDaSsGw8++l1HazsomNMWvWE0VgUaauJZI+4fQ3Gf9deh7sg QlbgK3EENTe26fspNi0bRHaiy+ZK8IriL5Vw3Jd0RWc1Z1PuyVIzg6Dn2rDlWQ6dIWzb /KtQAg1w4F8i6M17sUpU+1jiVOLzyQqAnSqx/LdqQFUxr/0esWSoB2WO2uOGOoFH4pti TVRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZcVDzvgY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u4-20020a17090282c400b001867d1a71a6si631641plz.473.2022.10.24.14.58.16; Mon, 24 Oct 2022 14:58:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZcVDzvgY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230355AbiJXVul (ORCPT + 99 others); Mon, 24 Oct 2022 17:50:41 -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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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_request 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/srp/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 = host_to_target(scmnd->device->host); - struct srp_request *req = (struct srp_request *) scmnd->host_scribble; + struct srp_request *req = 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) shost_printk(KERN_ERR, target->scsi_host, "SRP abort called\n"); - if (!req) - return SUCCESS; tag = blk_mq_unique_tag(scsi_cmd_to_rq(scmnd)); ch_idx = blk_mq_unique_tag_to_hwq(tag); if (WARN_ON_ONCE(ch_idx >= target->ch_count)) -- 2.35.1