From patchwork Sat Jul 23 00:23:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 9244435 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B40FF60459 for ; Sat, 23 Jul 2016 00:23:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3FE9281C3 for ; Sat, 23 Jul 2016 00:23:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92F13281D2; Sat, 23 Jul 2016 00:23:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E6AC281E1 for ; Sat, 23 Jul 2016 00:23:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751987AbcGWAX4 (ORCPT ); Fri, 22 Jul 2016 20:23:56 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:34568 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750713AbcGWAXz (ORCPT ); Fri, 22 Jul 2016 20:23:55 -0400 Received: by mail-pf0-f172.google.com with SMTP id p64so45836786pfb.1 for ; Fri, 22 Jul 2016 17:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=date:from:to:subject:message-id:user-agent:mime-version :content-transfer-encoding; bh=LnHse0AzLPyF6C3A4jukuP5qGFullClI9wq7ELrV4GQ=; b=hFv/WVBEwIjLDzePxj889yzsNpWCgvrd79vPtffH5yjemrQTXuCraNgUlfXypC0HgL eRFhcF6/Acl1IbNiDXlmOpxTLieq8tRz6lhnCsL9b0SzZ/wjyxSHQxdT84PZ9KSzihRs +RdeyRJJc3aJYcy88csahBjD68wCBXn4FMiKc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:user-agent :mime-version:content-transfer-encoding; bh=LnHse0AzLPyF6C3A4jukuP5qGFullClI9wq7ELrV4GQ=; b=KmydQHiexK1afUoWg5Jt5C/Wx/fQeN366dRaYWVz1fEwDYG2MN3nuRkF5uWzAs+y9J jAWKkAzzGtoRGMcRogGKhh1d3OHgRorfR5DMvBwhDKQzqeeARNLGiK/MJwhDfAqGTMt+ qL4K6xExiQXotgYMdbJGxRZwAS43sY2OIDgo2kWoTLd1ek6wNdd2R5D/jSIJ1Gy5dEfz dfyyXytJdZfPgw1WrsLQ//dalB425wZcZL37kI/RizUpOwMjXUl0eL7lcLoF1cvC3dqJ Jvdlvt9tX/EaVoTaiwYt6hHq1r+Qji8yOa2dho5pHlJbsYbzm7ZR3nEpZzfGET34N+RJ EsqA== X-Gm-Message-State: AEkoouvEaXXIMLbyDC/cpbfDULUpjoX3ag67murBbViSl5nhgY0cG0ud9uMfvm599IZ2F1IQ X-Received: by 10.98.152.6 with SMTP id q6mr10986731pfd.86.1469233433954; Fri, 22 Jul 2016 17:23:53 -0700 (PDT) Received: from flash ([192.19.224.250]) by smtp.gmail.com with ESMTPSA id vt10sm22538834pab.43.2016.07.22.17.23.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jul 2016 17:23:53 -0700 (PDT) Date: Fri, 22 Jul 2016 17:23:52 -0700 From: james.smart@broadcom.com (James Smart) To: linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org Subject: [PATCH] nvme-fabrics: set sqe.command_id in core, not transports Message-ID: <5792b918.ManFlYqqCmUKB4ry%james.smart@broadcom.com> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP set sqe.command_id in core, not transports Patch is cut against the linux-nvme for-4.8/drivers branch Signed-off-by: James Smart Acked-by: Johannes Thumshirn --- drivers/nvme/host/core.c | 3 ++- drivers/nvme/host/rdma.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 74b1d38..b391f54 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -290,7 +290,6 @@ static inline void nvme_setup_rw(struct nvme_ns *ns, struct request *req, memset(cmnd, 0, sizeof(*cmnd)); cmnd->rw.opcode = (rq_data_dir(req) ? nvme_cmd_write : nvme_cmd_read); - cmnd->rw.command_id = req->tag; cmnd->rw.nsid = cpu_to_le32(ns->ns_id); cmnd->rw.slba = cpu_to_le64(nvme_block_nr(ns, blk_rq_pos(req))); cmnd->rw.length = cpu_to_le16((blk_rq_bytes(req) >> ns->lba_shift) - 1); @@ -330,6 +329,8 @@ int nvme_setup_cmd(struct nvme_ns *ns, struct request *req, else nvme_setup_rw(ns, req, cmd); + cmd->common.command_id = req->tag; + return ret; } EXPORT_SYMBOL_GPL(nvme_setup_cmd); diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 3e3ce2b..0cd7c3e 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1447,7 +1447,6 @@ static int nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx, if (ret) return ret; - c->common.command_id = rq->tag; blk_mq_start_request(rq); map_len = nvme_map_len(rq);