nvme: let set_capacity_revalidate_and_notify update the bdev size

[ Upstream commit 5dd55749b79cdf471ca0966ad91541daebac3e2f ]

There is no good reason to call revalidate_disk_size separately.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: 74363ec674cb ("zram: fix uninitialized ZRAM not releasing backing device")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index bee55902fe6cecafd707e6a987b11921a1036cf8..c8e64a1e2fc045a231e156f14351ca1386bf89b8 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2132,7 +2132,7 @@ static void nvme_update_disk_info(struct gendisk *disk,
                        capacity = 0;
        }
 
-       set_capacity_revalidate_and_notify(disk, capacity, false);
+       set_capacity_revalidate_and_notify(disk, capacity, true);
 
        nvme_config_discard(disk, ns);
        nvme_config_write_zeroes(disk->queue, ns->ctrl);
@@ -2213,7 +2213,6 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id)
                blk_stack_limits(&ns->head->disk->queue->limits,
                                 &ns->queue->limits, 0);
                blk_queue_update_readahead(ns->head->disk->queue);
-               nvme_update_bdev_size(ns->head->disk);
                blk_mq_unfreeze_queue(ns->head->disk->queue);
        }
 #endif
@@ -4095,8 +4094,6 @@ out:
         */
        if (ret > 0 && (ret & NVME_SC_DNR))
                nvme_ns_remove(ns);
-       else
-               revalidate_disk_size(ns->disk, true);
 }
 
 static void nvme_validate_or_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)