nvme: Fix setting logical block format when revalidating

Keith Busch · axboe · commit 5e0fab57fb3e · 2017-10-30T08:22:41.000-06:00
Revalidating the disk needs to set the logical block format and capacity, otherwise it can't figure out if the users modified anything about the namespace. Fixes: cdbff4f ("nvme: remove nvme_revalidate_ns") Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
@@ -1249,6 +1249,7 @@ static int nvme_revalidate_disk(struct gendisk *disk)
 		goto out;
 	}
 
+	__nvme_revalidate_disk(disk, id);
 	nvme_report_ns_ids(ctrl, ns->ns_id, id, eui64, nguid, &uuid);
 	if (!uuid_equal(&ns->uuid, &uuid) ||
 	    memcmp(&ns->nguid, &nguid, sizeof(ns->nguid)) ||

Original file line number	Diff line number	Diff line change
`@@ -1249,6 +1249,7 @@ static int nvme_revalidate_disk(struct gendisk *disk)`
`1249`	`1249`	`goto out;`
`1250`	`1250`	`}`
`1251`	`1251`
	`1252`	`+ __nvme_revalidate_disk(disk, id);`
`1252`	`1253`	`nvme_report_ns_ids(ctrl, ns->ns_id, id, eui64, nguid, &uuid);`
`1253`	`1254`	`if (!uuid_equal(&ns->uuid, &uuid) \|\|`
`1254`	`1255`	`memcmp(&ns->nguid, &nguid, sizeof(ns->nguid)) \|\|`