Re: next-20260917 and next-20260918: merge of the block tree breaks all zoned devices

[Damien Le Moal <dlemoal@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 630 bytes --]

On 9/21/26 00:18, Mark Brown wrote:
> I did say when I did that merge that I had no confidence in it but
> nobody responded.  Can you please send me a commit on top of current
> -next which fixes up the resolution appropriately?  I can drop extra
> fixups in relatively easily, it's probably safer to take something that
> you have tested.

Mark,

My apologies for not replying, but I was traveling. I had looked at your
resolution but only quickly and I did not notice the incorrect comparison
causing the issue.

I am attaching a diff that cleans up the conflict resolution.

Thanks!

-- 
Damien Le Moal
Western Digital Research

[-- Attachment #2: blk-zoned.diff --]
[-- Type: text/x-patch, Size: 1258 bytes --]

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index bae48f0d3464..dd8a72e352c1 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -2031,11 +2031,16 @@ void disk_init_zone_resources(struct gendisk *disk)
 static unsigned int disk_get_nr_zones(struct gendisk *disk, sector_t capacity)
 {
 	struct queue_limits *lim = &disk->queue->limits;
+	unsigned long long nr_zones;
 
 	if (!capacity || !lim->chunk_sectors)
 		return 0;
 
-	return DIV_ROUND_UP_ULL(capacity, lim->chunk_sectors);
+	nr_zones = DIV_ROUND_UP_ULL(capacity, lim->chunk_sectors);
+	if (nr_zones > UINT_MAX)
+		return 0;
+
+	return nr_zones;
 }
 
 /*
@@ -2197,7 +2202,7 @@ static int disk_init_revalidate_args(struct gendisk *disk,
 {
 	args->disk = disk;
 	args->nr_zones = disk_get_nr_zones(disk, args->capacity);
-	if (args->nr_zones > UINT_MAX)
+	if (!args->nr_zones)
 		return -EINVAL;
 
 	/* Cached zone conditions: 1 byte per zone */
@@ -2329,8 +2334,6 @@ static int disk_revalidate_capacity(struct gendisk *disk,
 	nr_zones = disk_get_nr_zones(disk, args->capacity);
 	if (!args->capacity || !nr_zones)
 		goto drop_all_zwplugs;
-	if (args->capacity >= args->nr_zones)
-		goto drop_all_zwplugs;
 
 	/*
 	 * Check if the capacity has changed. If it did, assume that the device