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 EDB6FC2D0A8 for ; Mon, 28 Sep 2020 12:35:48 +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 AAD5621531 for ; Mon, 28 Sep 2020 12:35:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="I+UKQjh7"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="wFpe0S7v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAD5621531 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=+XElUIRg+NNMrBr5QZJhnfr0zWvQUGJuaKLv7jJwg2I=; b=I+UKQjh7jQj4HeE4ZCeznClHC d+Q7pCZvULp5vSIBFGvgNQ1Mtcmai1KbjxlbHErSxzSffwQ53XaOtvVw+qasjBAeZyhXqGi1DmsLN 21Qyk17W2JbdxoZT+rZKZnPjP1Axa6JJf6nOb+K7fsKISXjfSyibLXHGiVsXbX0IsoUREnyzHoSgU t1Dq4E5lFYcx28eCMtk/uIS4V4Mmryzm356Fa+zPPvUHVDWdI7RaNsycNqRJLP8OEflcY0S+/1w8u VqCYVVHniSdlYACAlT6IlthUku0r9aQBHQllNFGG0Qa2LcnRgfDrYeuobVw3Sx4mkknIInsGRMdgI itHth06pA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMsNd-0002Zh-NR; Mon, 28 Sep 2020 12:35:45 +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 1kMsNG-0002Or-Uy for linux-nvme@merlin.infradead.org; Mon, 28 Sep 2020 12:35:22 +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=/0ysUoAQb43f5ML/+ZrSG81SHDB2segAwZOpl3+hqis=; b=wFpe0S7vvvHQJWi6jeDYpjURwW hGAg/XfyRBUj/lkHuKUo33OXB5lxb3ZQ5zGv6kujj9XNcGWoN39koGPWaRmnYq1G5w+3MrjVN9fdl xQNQLfW29WcbSNuzK1S3j2eL0G83wU+rXEa4crv6s6VYlOWYk92OQao+fUNrm+P4jIiPZfEHipi55 YWUxwO52WQq0PSdw23v29uaFEokwN8fMYUTeWSw2D7QS1et98FwMWqJ8Vxhs5gKSRv7YLjOXIekoY OJzam7nsMZn7TTgY8QPHzFMdXQiplDbv3WadXCCobSqIj4h+MyYgIYPQQQ8V2bap301KJlEqi/ImM ChZSvPxA==; 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 1kMsNE-0004lJ-Pa; Mon, 28 Sep 2020 12:35:21 +0000 From: Christoph Hellwig To: linux-nvme@lists.infradead.org Subject: [PATCH 12/20] nvme: remove the 0 lba_shift check in nvme_update_ns_info Date: Mon, 28 Sep 2020 14:34:54 +0200 Message-Id: <20200928123502.435373-13-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 We can't reach this code if Identify Namespace failed. Signed-off-by: Christoph Hellwig --- drivers/nvme/host/core.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 0114fe47de3571..910198c3e0bbd1 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2129,13 +2129,7 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id) int ret; blk_mq_freeze_queue(ns->disk->queue); - /* - * If identify namespace failed, use default 512 byte block size so - * block layer can use before failing read/write for 0 capacity. - */ ns->lba_shift = id->lbaf[lbaf].ds; - if (ns->lba_shift == 0) - ns->lba_shift = 9; switch (ns->head->ids.csi) { case NVME_CSI_NVM: -- 2.28.0 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme