From: Josef Bacik Date: Tue, 9 Nov 2021 15:12:05 +0000 (-0500) Subject: btrfs: remove global rsv stealing logic for orphan cleanup X-Git-Tag: howlett/maple/20220722_2~1461^2~91 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6dbdd578cd4fcb88ad9e57777a140e3349323e28;p=users%2Fjedix%2Flinux-maple.git btrfs: remove global rsv stealing logic for orphan cleanup This is very old code before we were stealing from the global reserve during evict. We have proper ways to steal from the global reserve while we're evicting, so rip out this code as it's no longer necessary. Reviewed-by: Nikolay Borisov Signed-off-by: Josef Bacik Signed-off-by: David Sterba --- diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c index a546cd411de4..d277c7111b95 100644 --- a/fs/btrfs/space-info.c +++ b/fs/btrfs/space-info.c @@ -1606,16 +1606,9 @@ int btrfs_reserve_metadata_bytes(struct btrfs_root *root, enum btrfs_reserve_flush_enum flush) { struct btrfs_fs_info *fs_info = root->fs_info; - struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv; int ret; ret = __reserve_bytes(fs_info, block_rsv->space_info, orig_bytes, flush); - if (ret == -ENOSPC && - unlikely(root->orphan_cleanup_state == ORPHAN_CLEANUP_STARTED)) { - if (block_rsv != global_rsv && - !btrfs_block_rsv_use_bytes(global_rsv, orig_bytes)) - ret = 0; - } if (ret == -ENOSPC) { trace_btrfs_space_reservation(fs_info, "space_info:enospc", block_rsv->space_info->flags,