nvme: Increase block size variable size to 32-bit

dkruces · keithbusch · commit bdbfcd5f6caa · 2023-06-12T10:36:59.000-07:00
Increase block size variable size to 32-bit unsigned to be able to
support block devices larger than 32k (starting from 64 KiB).

Physical and logical block size already support unsigned 32-bit.

Signed-off-by: Daniel Gomez &lt;da.gomez@samsung.com&gt;
Reviewed-by: Luis Chamberlain &lt;mcgrof@kernel.org&gt;
Reviewed-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Keith Busch &lt;kbusch@kernel.org&gt;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
@@ -1835,7 +1835,7 @@ static void nvme_update_disk_info(struct gendisk *disk,
 		struct nvme_ns *ns, struct nvme_id_ns *id)
 {
 	sector_t capacity = nvme_lba_to_sect(ns, le64_to_cpu(id->nsze));
-	unsigned short bs = 1 << ns->lba_shift;
+	u32 bs = 1U << ns->lba_shift;
 	u32 atomic_bs, phys_bs, io_opt = 0;
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -1835,7 +1835,7 @@ static void nvme_update_disk_info(struct gendisk *disk,`
`1835`	`1835`	`struct nvme_ns ns, struct nvme_id_ns id)`
`1836`	`1836`	`{`
`1837`	`1837`	`sector_t capacity = nvme_lba_to_sect(ns, le64_to_cpu(id->nsze));`
`1838`		`- unsigned short bs = 1 << ns->lba_shift;`
	`1838`	`+ u32 bs = 1U << ns->lba_shift;`
`1839`	`1839`	`u32 atomic_bs, phys_bs, io_opt = 0;`
`1840`	`1840`
`1841`	`1841`	`/*`