From mboxrd@z Thu Jan 1 00:00:00 1970 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,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 5F8DAC43460 for ; Fri, 14 May 2021 21:36:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4503B61442 for ; Fri, 14 May 2021 21:36:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233505AbhENVhi (ORCPT ); Fri, 14 May 2021 17:37:38 -0400 Received: from mail-pg1-f177.google.com ([209.85.215.177]:42991 "EHLO mail-pg1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233546AbhENVhW (ORCPT ); Fri, 14 May 2021 17:37:22 -0400 Received: by mail-pg1-f177.google.com with SMTP id z4so246949pgb.9 for ; Fri, 14 May 2021 14:36:09 -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=6CTnkeKhcotq5OMfqrz/2VKArxZCP+Flz3k3xUHSvnE=; b=gG9ScN4pbLx25Sj3Pg0vXJeTIxBMCodODacCKFGrKqPaPuD7nzYNf2vfdssi+s/J2s OPGoBlQAL9uzwUdbVuSHrBS8VA99jvJ0ObiPFc4BsE08hNAvQsoksswaq0SCp6q6mxzx Sl8sN9LVLBu5koS2wwgovsZmshpYgCL3xK/s9xM7879spYw/cBQYWqBTrL4mxfV4BGxK yjza596qKNrX7CU9IaAiRFkpDhGnuFaiQ3WLSWC++e8FjjF9SESUQ/wsaPcfkSSU3cPW 9vzIl8SfgxrMYf9M+TXkS0qhAKB0ki4iq/ysIg5ax0uk773ie5FYD7lGWouRHdpU+644 S3OQ== X-Gm-Message-State: AOAM530aISnuvqHbr4jViom0RUAhVAe7YkQ16pixgygieygxQQPbfrR+ UMjYgb5gOCh8Q4H4hTaaSFU= X-Google-Smtp-Source: ABdhPJw+idgBn2zg76dStLKrgdiGVGgqFOkBdaNqUM4ESnnmfeXuSc150IVk2fDOUisdgHz+CIC7fg== X-Received: by 2002:a63:5249:: with SMTP id s9mr48640206pgl.192.1621028169149; Fri, 14 May 2021 14:36:09 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 May 2021 14:36:08 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Don Brace , "James E.J. Bottomley" Subject: [PATCH 21/50] hpsa: Use blk_req() instead of scsi_cmnd.request Date: Fri, 14 May 2021 14:33:27 -0700 Message-Id: <20210514213356.5264-73-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 Content-Transfer-Encoding: 8bit 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/hpsa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index f135a10f582b..9fcbe9a84de6 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -5686,7 +5686,7 @@ static int hpsa_scsi_queue_command(struct Scsi_Host *sh, struct scsi_cmnd *cmd) /* Get the ptr to our adapter structure out of cmd->host. */ h = sdev_to_hba(cmd->device); - BUG_ON(cmd->request->tag < 0); + BUG_ON(blk_req(cmd)->tag < 0); dev = cmd->device->hostdata; if (!dev) { @@ -5729,7 +5729,7 @@ static int hpsa_scsi_queue_command(struct Scsi_Host *sh, struct scsi_cmnd *cmd) * and is therefore a brand-new command. */ if (likely(cmd->retries == 0 && - !blk_rq_is_passthrough(cmd->request) && + !blk_rq_is_passthrough(blk_req(cmd)) && h->acciopath_status)) { /* Submit with the retry_pending flag unset. */ rc = hpsa_ioaccel_submit(h, c, cmd, false); @@ -5894,7 +5894,7 @@ static int hpsa_scsi_add_host(struct ctlr_info *h) */ static int hpsa_get_cmd_index(struct scsi_cmnd *scmd) { - int idx = scmd->request->tag; + int idx = blk_req(scmd)->tag; if (idx < 0) return idx;