From patchwork Fri Nov 3 10:02:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 10039769 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 06DEA6032D for ; Fri, 3 Nov 2017 10:03:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A1302958A for ; Fri, 3 Nov 2017 10:03:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F33E12958E; Fri, 3 Nov 2017 10:03:39 +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.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable 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 B84E92958A for ; Fri, 3 Nov 2017 10:03:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755925AbdKCKDA (ORCPT ); Fri, 3 Nov 2017 06:03:00 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:47593 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750883AbdKCKC7 (ORCPT ); Fri, 3 Nov 2017 06:02:59 -0400 Received: by mail-wm0-f68.google.com with SMTP id r196so341902wmf.2 for ; Fri, 03 Nov 2017 03:02:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1O5q9LJXCPEkekp4/EEY92gla8G1Gb6/J45bdpp1CK8=; b=sYMf8lL2t5rm5S8ziKNrZxzUW0TkyCJ9dmILj7yckvOkOWfy15gfJZjU+746B0a0Bl 9lKZAMxqJh4adEEF6QDtMDTOU6uCjZl1URS+IzT7hlqk0rYjszZVXhGavew5vVk2zvfK C8XI6nU86X1rY6zGYYs03TqRKQNT8J+iX9rEnKWG2L/sG7jpNFJKxe/x9IcqVnoCW5RR 2vHdUEpWQ5Q5WlLrYaJF+6dIUuClf3D3Uj1ICV7s5VipWsKNcMXAYgyXF5Zk9LuZ7w/G sv9/yJhiyntc4cLXhMMgT1DQESEoWKrFfvMVDLfVis/LREFsc6amYW8C7OrnDlm/bKvz 69MQ== 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=1O5q9LJXCPEkekp4/EEY92gla8G1Gb6/J45bdpp1CK8=; b=Nj88g4rEMjsmMyQLFCpMviTvbtltT8sLJrxG2eA8/4SbfGnGK/XL/achf8BWQSJFc+ cV4H5PFPp+YzCkKSxwRmXed4I7XtYSbPMIWdW6sJBdXsU7/1NmpcWp2QHZU2h2ANrO47 GSzTuOrViU1BsgLAXpNaBjh1827qcmJQ+j4qNmPnoMwstUGwop4GfvHYkIdsyu2Q7h9K dzaPW6SSe5yr/cbogCuzC9yLcS3jOGM2jGPlhu5H3QIliX00jWaf6wm6iSgHSlzA5rMj kcB8KI0Jg1gXa09wLOOWZn7+Ysmy+mLutGIyPDO9NvINaZbiqJJ257OX8/2nNBljHVKA pEPA== X-Gm-Message-State: AMCzsaUlDXDJoeBzA9Xzce9OjA1nk5qNmHaBzaSr2o9ozIOQkAmY+okj tyiuZkhPCbmE4Yo+iinPQsO3lA== X-Google-Smtp-Source: ABhQp+RLDmzOZH5wzk+EnRjhL8bk8PjolmEr3jFnRTwSgSwcsW15uK1UQmN82cKOJHMUE2SS3IajsA== X-Received: by 10.80.147.83 with SMTP id n19mr8443940eda.36.1509703377963; Fri, 03 Nov 2017 03:02:57 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id 41sm4837530edz.66.2017.11.03.03.02.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Nov 2017 03:02:57 -0700 (PDT) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: hch@lst.de, sagi@grimberg.me, keith.busch@intel.com Cc: linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= Subject: [PATCH 1/3] nvme: do not check for ns on rw path Date: Fri, 3 Nov 2017 11:02:48 +0100 Message-Id: <1509703370-20379-2-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509703370-20379-1-git-send-email-javier@cnexlabs.com> References: <1509703370-20379-1-git-send-email-javier@cnexlabs.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On the rw path, the ns is assumed to be set. However, a check is still done, inherited from the time the code resided at nvme_queue_rq(). Eliminate this check, which also eliminates a smatch complain for not doing proper NULL checks on ns. Signed-off-by: Javier González --- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 5a14cc7f28ee..bd1d5ff911c9 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -472,7 +472,7 @@ static inline blk_status_t nvme_setup_rw(struct nvme_ns *ns, * unless this namespace is formated such that the metadata can be * stripped/generated by the controller with PRACT=1. */ - if (ns && ns->ms && + if (ns->ms && (!ns->pi_type || ns->ms != sizeof(struct t10_pi_tuple)) && !blk_integrity_rq(req) && !blk_rq_is_passthrough(req)) return BLK_STS_NOTSUPP;