]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
btrfs: fix tail delete of RAID stripe-extents
authorJohannes Thumshirn <johannes.thumshirn@wdc.com>
Mon, 13 Jan 2025 19:31:46 +0000 (20:31 +0100)
committerDavid Sterba <dsterba@suse.com>
Tue, 14 Jan 2025 14:49:10 +0000 (15:49 +0100)
Fix tail delete of RAID stripe-extents, if there is a range to be deleted
as well after the tail delete of the extent.

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/raid-stripe-tree.c

index 9e559ad48810b704c997ff5e51222aced0b91637..ef76202c3a38460c5a36d7309ac0a616f73b0cc0 100644 (file)
@@ -119,11 +119,18 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le
                 * length to the new size and then re-insert the item.
                 */
                if (found_start < start) {
-                       u64 diff = start - found_start;
+                       u64 diff_start = start - found_start;
 
                        btrfs_partially_delete_raid_extent(trans, path, &key,
-                                                          diff, 0);
-                       break;
+                                                          diff_start, 0);
+
+                       start += (key.offset - diff_start);
+                       length -= (key.offset - diff_start);
+                       if (length == 0)
+                               break;
+
+                       btrfs_release_path(path);
+                       continue;
                }
 
                /*