btrfs: remove global rsv stealing logic for orphan cleanup
authorJosef Bacik <josef@toxicpanda.com>
Tue, 9 Nov 2021 15:12:05 +0000 (10:12 -0500)
committerDavid Sterba <dsterba@suse.com>
Mon, 3 Jan 2022 14:09:45 +0000 (15:09 +0100)
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 <nborisov@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/space-info.c

index a546cd4..d277c71 100644 (file)
@@ -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,