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=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 7F8C0C2D0A8 for ; Mon, 28 Sep 2020 12:35:24 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 276D921531 for ; Mon, 28 Sep 2020 12:35:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ohjfjGI3"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="gvYdoy32" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 276D921531 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=AydSHqr+XseE3I/kGpvNuHyRH9cRKHTkwQQDEL5mOLc=; b=ohjfjGI3mZxmdXlWcnkHk1lSN jBJr9c94usukYgEoCvW19E9QL13AIgPeC8kUDZY/q7T3QQlLlvkdb+DjMDpglbQi1ybX2mY5kWW3X BOYJRlrEZuSiG29MGyS60I2VT53M7+78dj5pAqr2TYuPnf2Tv2sM8unaq0QQR5U8EhHyFRXcJVPUn jGd3TIhtLKNrvSlq2ivWT9SvFrKVbPEOfBja8XMoOqDyfT0cFDjvg3tV39AOuZfe+NzmueEN234H/ /OoFdJ5RguKFR9Ye7P3OUaffpfksB4VRHMm5UamErMmKIqs+Hy5TceJ+xctIysT2FVFIBs1RT1FgR iXi0q13mA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMsNF-0002OU-KQ; Mon, 28 Sep 2020 12:35:21 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMsN9-0002Lw-5y for linux-nvme@merlin.infradead.org; Mon, 28 Sep 2020 12:35:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=+vAjjeIc7Gd9TMlyr0HyQbWo2WgTa4v7NJkNCqIVGRQ=; b=gvYdoy32wV2HfKJuU2bo39Dwp4 7Xndul04+nz7IjjXJVs/Fc+rVgPmuAq+qh3AqCcP/FDwOQfn5iL6keaAv5VXtGCYB8wn1qrnknsIK Us40AEiFuVoIunrt6rcXqmXdmbchpKxYx5r8vFZWv3RyAo/x5lEIUntpUYWfrj/qCkmKSXvmEFMfe H7hhbgwfVt0zoIh3LLymw/432j11qg6WDRm/wtsbTQE45TWHmXYSHa61m1o4o0W3lQA3E3An3hGtF Xx3uyeEvFHuz7gitijBoxxWwu8F12qiQqX92vdeL9pjB1wcuirNuMCQS6A8Rqhdy7rsR759g43ORl nmUlAO9Q==; Received: from [2001:4bb8:180:7b62:3a1d:d74e:d75b:5fe7] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMsN7-0004ib-OV; Mon, 28 Sep 2020 12:35:14 +0000 From: Christoph Hellwig To: linux-nvme@lists.infradead.org Subject: [PATCH 07/20] nvme: lift the check for an unallocated namespace into nvme_identify_ns Date: Mon, 28 Sep 2020 14:34:49 +0200 Message-Id: <20200928123502.435373-8-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200928123502.435373-1-hch@lst.de> References: <20200928123502.435373-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Keith Busch , Jens Axboe , Damien Le Moal , Sagi Grimberg Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Move the check from the two callers into the common helper. Signed-off-by: Christoph Hellwig --- drivers/nvme/host/core.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index fede487f6e043f..7b1423c7e7fc58 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1381,9 +1381,16 @@ static int nvme_identify_ns(struct nvme_ctrl *ctrl, error = nvme_submit_sync_cmd(ctrl->admin_q, &c, *id, sizeof(**id)); if (error) { dev_warn(ctrl->device, "Identify namespace failed (%d)\n", error); - kfree(*id); + goto out_free_id; } + error = -ENODEV; + if ((*id)->ncap == 0) /* namespace not allocated or attached */ + goto out_free_id; + return 0; + +out_free_id: + kfree(*id); return error; } @@ -2169,11 +2176,6 @@ static int nvme_validate_ns(struct nvme_ns *ns) if (ret) goto out; - if (id->ncap == 0) { - ret = -ENODEV; - goto free_id; - } - ret = nvme_report_ns_ids(ctrl, ns->head->ns_id, id, &ids); if (ret) goto free_id; @@ -3913,9 +3915,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) if (ret) goto out_free_queue; - if (id->ncap == 0) /* no namespace (legacy quirk) */ - goto out_free_id; - ret = nvme_init_ns_head(ns, nsid, id); if (ret) goto out_free_id; -- 2.28.0 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme