From 310b30e575b1e2b9a569c3582062b79c5a562fb7 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 28 Sep 2020 12:12:02 +0200 Subject: nvme: remove the 0 lba_shift check in nvme_update_ns_info We can no longer reach this code if Identify Namespace failed. Signed-off-by: Christoph Hellwig Reviewed-by: Keith Busch Reviewed-by: Sagi Grimberg Reviewed-by: Chaitanya Kulkarni Reviewed-by: Damien Le Moal --- drivers/nvme/host/core.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'drivers/nvme') diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 0114fe47de35..910198c3e0bb 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: -- cgit v1.2.3