Commit 5dd55749 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: let set_capacity_revalidate_and_notify update the bdev size 



There is no good reason to call revalidate_disk_size separately.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3b4f85d0

drivers/nvme/host/core.c

+1 −4
Original line number Diff line number Diff line
@@ -2053,7 +2053,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, ns);
@@ -2134,7 +2134,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
@@ -3963,8 +3962,6 @@ static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_ids *ids) 
	 */

	if (ret && ret != -ENOMEM && !(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)