]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: zoned: fixup last alloc pointer after extent removal for DUP
authorNaohiro Aota <naohiro.aota@wdc.com>
Fri, 23 Jan 2026 12:41:35 +0000 (21:41 +0900)
committerSasha Levin <sashal@kernel.org>
Wed, 4 Mar 2026 12:21:21 +0000 (07:21 -0500)
[ Upstream commit e2d848649e64de39fc1b9c64002629b4daa1105d ]

When a block group is composed of a sequential write zone and a
conventional zone, we recover the (pseudo) write pointer of the
conventional zone using the end of the last allocated position.

However, if the last extent in a block group is removed, the last extent
position will be smaller than the other real write pointer position.
Then, that will cause an error due to mismatch of the write pointers.

We can fixup this case by moving the alloc_offset to the corresponding
write pointer position.

Fixes: c0d90a79e8e6 ("btrfs: zoned: fix alloc_offset calculation for partly conventional block groups")
CC: stable@vger.kernel.org # 6.16+
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/btrfs/zoned.c

index 8e6e96660fa66d95022daa7476c34a0f63be4853..4cbe1ba7af66dfbe0d52ed90d2d180670cdd12ff 100644 (file)
@@ -1442,6 +1442,20 @@ static int btrfs_load_block_group_dup(struct btrfs_block_group *bg,
                return -EIO;
        }
 
+       /*
+        * When the last extent is removed, last_alloc can be smaller than the other write
+        * pointer. In that case, last_alloc should be moved to the corresponding write
+        * pointer position.
+        */
+       for (int i = 0; i < map->num_stripes; i++) {
+               if (zone_info[i].alloc_offset == WP_CONVENTIONAL)
+                       continue;
+               if (last_alloc <= zone_info[i].alloc_offset) {
+                       last_alloc = zone_info[i].alloc_offset;
+                       break;
+               }
+       }
+
        if (zone_info[0].alloc_offset == WP_CONVENTIONAL)
                zone_info[0].alloc_offset = last_alloc;