From patchwork Fri May 14 21:33:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 439185 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A21BBC433B4 for ; Fri, 14 May 2021 21:36:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 809066143F for ; Fri, 14 May 2021 21:36:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233551AbhENVhj (ORCPT ); Fri, 14 May 2021 17:37:39 -0400 Received: from mail-pg1-f172.google.com ([209.85.215.172]:34386 "EHLO mail-pg1-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233591AbhENVhX (ORCPT ); Fri, 14 May 2021 17:37:23 -0400 Received: by mail-pg1-f172.google.com with SMTP id l70so268802pga.1 for ; Fri, 14 May 2021 14:36:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aBpDebaAugL9JvWwPHRHrVAjzLTctYjhzrp2WXlm6a4=; b=PyhPvzMxNwnuHRx7cdW2xewokgZgqoxKATQf2AY/i3IS/gyzSyiFwb6Sr+Ycn3mMVy NQutUooSq8OCLksOKGnH4cCmqYy4aPM6xaAuIr/6XRXj+yGN1C81pQ/9OzYrRYs5IL21 7p1rNaFim20HlFVvZ8aFvb3RLABq5gz5DWPsBfy90DA2hJMZ+v9jVz/LNoxI59cxBZtW YyG3CLA08YwboisZlHJDCh3gFzqrh0MvVDQxPBq67GrhWwxwjTtMhzXSYIm9S5e9mSEl r+hTi4VTztFipP+HeNfjieap5HRfrhuJdnx8FSa1lQXp5oleVtjVLeueoLTALZE6EdmA neSg== X-Gm-Message-State: AOAM530IZ4bOCrnNmouhBDuEf8xt0SQV4eFgVIWSBaEi5MJMF7Q8A00W jSR0aV0+4174aKbQ3XDEaDg= X-Google-Smtp-Source: ABdhPJxC/kUcoc4/H1dgBLFzLF51YIZEi/sNh1aWzxM9LMBNSMcvQtMD0D9C/j+m/XjDvQtI0FOD6g== X-Received: by 2002:a63:b211:: with SMTP id x17mr41251582pge.106.1621028170662; Fri, 14 May 2021 14:36:10 -0700 (PDT) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:d7:e40c:c579:7cd8:c046]) by smtp.gmail.com with ESMTPSA id js6sm9307262pjb.0.2021.05.14.14.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 May 2021 14:36:10 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Tyrel Datwyler , Michael Ellerman , "James E.J. Bottomley" Subject: [PATCH 22/50] ibmvfc: Use blk_req() instead of scsi_cmnd.request Date: Fri, 14 May 2021 14:33:28 -0700 Message-Id: <20210514213356.5264-74-bvanassche@acm.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210514213356.5264-1-bvanassche@acm.org> References: <20210514213356.5264-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Prepare for removal of the request pointer by using blk_req() instead. This patch does not change any functionality. Signed-off-by: Bart Van Assche --- drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index 6540d48eb0e8..e8b4f72f9161 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c @@ -1908,7 +1908,7 @@ static int ibmvfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) struct ibmvfc_cmd *vfc_cmd; struct ibmvfc_fcp_cmd_iu *iu; struct ibmvfc_event *evt; - u32 tag_and_hwq = blk_mq_unique_tag(cmnd->request); + u32 tag_and_hwq = blk_mq_unique_tag(blk_req(cmnd)); u16 hwq = blk_mq_unique_tag_to_hwq(tag_and_hwq); u16 scsi_channel; int rc;