Message ID | 20210514213356.5264-19-bvanassche@acm.org (mailing list archive) |
---|---|
State | Superseded |
Headers | show
Return-Path: <linux-scsi-owner@kernel.org> 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 120A7C433B4 for <linux-scsi@archiver.kernel.org>; Fri, 14 May 2021 21:34:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EA1A561442 for <linux-scsi@archiver.kernel.org>; Fri, 14 May 2021 21:34:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233070AbhENVfu (ORCPT <rfc822;linux-scsi@archiver.kernel.org>); Fri, 14 May 2021 17:35:50 -0400 Received: from mail-pj1-f41.google.com ([209.85.216.41]:40545 "EHLO mail-pj1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233018AbhENVfs (ORCPT <rfc822;linux-scsi@vger.kernel.org>); Fri, 14 May 2021 17:35:48 -0400 Received: by mail-pj1-f41.google.com with SMTP id b9-20020a17090a9909b029015cf9effaeaso2319278pjp.5 for <linux-scsi@vger.kernel.org>; Fri, 14 May 2021 14:34:36 -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=dM+WIxPnyXTYFBr8o0gTRnqx905xvNYXXAsx5ozXOmk=; b=r7ybpYh/uvTAGtnFXk3QEDuXUgRzs6EEugkcJ3DifIMVImA6aQ+v7MsoBoo+rO8jiY 0iuWlrV0qVlCjmznVK6roOrCydIyH2vOVl4hlxz+53zVRntikCrUBWCIN6YQseWrqMYC uHwSaYBoUv1wsfZUe9hJCQ0VUXgyyGwL9MeOJTz1w7FLVtvYYKMeYOV2ANc3Fr922DDK jfloI5EfXUxTZa/vT0VJ6ym+Z2+CmS91qD9czckgx+ecVvpi26ZUgCsKYt6V7+KrOG4A wM6tCVnulYSWFGAQfJNqo6mUyEsUgj5/CXD9n1ECbJQYwllsyYteitMKG8PU1ct5l2lz paJQ== X-Gm-Message-State: AOAM530SexGH8cZGfmWTEmKL09ut3LGt4J78IBq0svPb1msiGRupeaXc QYEHFnhWqJwY9JVOHBWBRQduoTr/Jjgj7g== X-Google-Smtp-Source: ABdhPJyi8S2dPcTuyWeHvulOyv9zjt1WfQG7uRk67pK4i1/yWrv3ndtkSK+xhBgg/68D6iirZgfJwA== X-Received: by 2002:a17:90b:8d5:: with SMTP id ds21mr13302468pjb.65.1621028076106; Fri, 14 May 2021 14:34:36 -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.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 May 2021 14:34:35 -0700 (PDT) From: Bart Van Assche <bvanassche@acm.org> To: "Martin K . Petersen" <martin.petersen@oracle.com> Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>, Adaptec OEM Raid Solutions <aacraid@microsemi.com>, "James E.J. Bottomley" <jejb@linux.ibm.com> Subject: [PATCH 18/50] dpt_i2o: Use blk_req() instead of scsi_cmnd.request Date: Fri, 14 May 2021 14:32:33 -0700 Message-Id: <20210514213356.5264-19-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: <linux-scsi.vger.kernel.org> X-Mailing-List: linux-scsi@vger.kernel.org |
Series |
Remove the request pointer from struct scsi_cmnd
|
expand
|
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index a18a4a08f049..75fbbd939b4a 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c @@ -652,7 +652,7 @@ static int adpt_abort(struct scsi_cmnd * cmd) msg[2] = 0; msg[3]= 0; /* Add 1 to avoid firmware treating it as invalid command */ - msg[4] = cmd->request->tag + 1; + msg[4] = blk_req(cmd)->tag + 1; if (pHba->host) spin_lock_irq(pHba->host->host_lock); rcode = adpt_i2o_post_wait(pHba, msg, sizeof(msg), FOREVER); @@ -2236,7 +2236,7 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_d msg[1] = ((0xff<<24)|(HOST_TID<<12)|d->tid); msg[2] = 0; /* Add 1 to avoid firmware treating it as invalid command */ - msg[3] = cmd->request->tag + 1; + msg[3] = blk_req(cmd)->tag + 1; // Our cards use the transaction context as the tag for queueing // Adaptec/DPT Private stuff msg[4] = I2O_CMD_SCSI_EXEC|(DPT_ORGANIZATION_ID<<16);
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 <bvanassche@acm.org> --- drivers/scsi/dpt_i2o.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)