| Message ID | fc5d9d03586f57ffa99ac9e2f10389e2d61a29a7.1733989299.git.jth@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | btrfs: more RST delete fixes | expand |
On Thu, Dec 12, 2024 at 7:57 AM Johannes Thumshirn <jth@kernel.org> wrote: > > From: Johannes Thumshirn <johannes.thumshirn@wdc.com> > > Don't try to delete RAID stripe-extents if we don't need to. > > Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> > --- > fs/btrfs/raid-stripe-tree.c | 13 ++++++++++++- > fs/btrfs/tests/raid-stripe-tree-tests.c | 3 ++- > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/fs/btrfs/raid-stripe-tree.c b/fs/btrfs/raid-stripe-tree.c > index 9ffc79f250fb..2c4ee5a9449a 100644 > --- a/fs/btrfs/raid-stripe-tree.c > +++ b/fs/btrfs/raid-stripe-tree.c > @@ -59,9 +59,20 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le > int slot; > int ret; > > - if (!stripe_root) > + if (!btrfs_fs_incompat(fs_info, RAID_STRIPE_TREE) || !stripe_root) > return 0; > > + if (!btrfs_is_testing(fs_info)) { > + struct btrfs_chunk_map *map; > + bool use_rst; > + > + map = btrfs_find_chunk_map(fs_info, start, length); We should handle the case where we can't find an extent map (NULL). Otherwise it looks good, thanks. > + use_rst = btrfs_need_stripe_tree_update(fs_info, map->type); > + btrfs_free_chunk_map(map); > + if (!use_rst) > + return 0; > + } > + > path = btrfs_alloc_path(); > if (!path) > return -ENOMEM; > diff --git a/fs/btrfs/tests/raid-stripe-tree-tests.c b/fs/btrfs/tests/raid-stripe-tree-tests.c > index 30f17eb7b6a8..f060c04c7f76 100644 > --- a/fs/btrfs/tests/raid-stripe-tree-tests.c > +++ b/fs/btrfs/tests/raid-stripe-tree-tests.c > @@ -478,8 +478,9 @@ static int run_test(test_func_t test, u32 sectorsize, u32 nodesize) > ret = PTR_ERR(root); > goto out; > } > - btrfs_set_super_compat_ro_flags(root->fs_info->super_copy, > + btrfs_set_super_incompat_flags(root->fs_info->super_copy, > BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE); > + btrfs_set_fs_incompat(root->fs_info, RAID_STRIPE_TREE); > root->root_key.objectid = BTRFS_RAID_STRIPE_TREE_OBJECTID; > root->root_key.type = BTRFS_ROOT_ITEM_KEY; > root->root_key.offset = 0; > -- > 2.43.0 > >
diff --git a/fs/btrfs/raid-stripe-tree.c b/fs/btrfs/raid-stripe-tree.c index 9ffc79f250fb..2c4ee5a9449a 100644 --- a/fs/btrfs/raid-stripe-tree.c +++ b/fs/btrfs/raid-stripe-tree.c @@ -59,9 +59,20 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le int slot; int ret; - if (!stripe_root) + if (!btrfs_fs_incompat(fs_info, RAID_STRIPE_TREE) || !stripe_root) return 0; + if (!btrfs_is_testing(fs_info)) { + struct btrfs_chunk_map *map; + bool use_rst; + + map = btrfs_find_chunk_map(fs_info, start, length); + use_rst = btrfs_need_stripe_tree_update(fs_info, map->type); + btrfs_free_chunk_map(map); + if (!use_rst) + return 0; + } + path = btrfs_alloc_path(); if (!path) return -ENOMEM; diff --git a/fs/btrfs/tests/raid-stripe-tree-tests.c b/fs/btrfs/tests/raid-stripe-tree-tests.c index 30f17eb7b6a8..f060c04c7f76 100644 --- a/fs/btrfs/tests/raid-stripe-tree-tests.c +++ b/fs/btrfs/tests/raid-stripe-tree-tests.c @@ -478,8 +478,9 @@ static int run_test(test_func_t test, u32 sectorsize, u32 nodesize) ret = PTR_ERR(root); goto out; } - btrfs_set_super_compat_ro_flags(root->fs_info->super_copy, + btrfs_set_super_incompat_flags(root->fs_info->super_copy, BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE); + btrfs_set_fs_incompat(root->fs_info, RAID_STRIPE_TREE); root->root_key.objectid = BTRFS_RAID_STRIPE_TREE_OBJECTID; root->root_key.type = BTRFS_ROOT_ITEM_KEY; root->root_key.offset = 0;