]> git.baikalelectronics.ru Git - kernel.git/commitdiff
btrfs: zoned: re-enable metadata over-commit for zoned mode
authorNaohiro Aota <naohiro.aota@wdc.com>
Mon, 7 Aug 2023 16:12:40 +0000 (01:12 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Sep 2023 10:28:06 +0000 (12:28 +0200)
commit 5b135b382a360f4c87cf8896d1465b0b07f10cb0 upstream.

Now that, we can re-enable metadata over-commit. As we moved the activation
from the reservation time to the write time, we no longer need to ensure
all the reserved bytes is properly activated.

Without the metadata over-commit, it suffers from lower performance because
it needs to flush the delalloc items more often and allocate more block
groups. Re-enabling metadata over-commit will solve the issue.

Fixes: 79417d040f4f ("btrfs: zoned: disable metadata overcommit for zoned")
CC: stable@vger.kernel.org # 6.1+
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/btrfs/space-info.c

index c7642c00a65d093bfa5dda0bc8578cbc5d6da613..2635fb4bffa06179696da2814ec3ac481fe6be57 100644 (file)
@@ -404,11 +404,7 @@ int btrfs_can_overcommit(struct btrfs_fs_info *fs_info,
                return 0;
 
        used = btrfs_space_info_used(space_info, true);
-       if (test_bit(BTRFS_FS_ACTIVE_ZONE_TRACKING, &fs_info->flags) &&
-           (space_info->flags & BTRFS_BLOCK_GROUP_METADATA))
-               avail = 0;
-       else
-               avail = calc_available_free_space(fs_info, space_info, flush);
+       avail = calc_available_free_space(fs_info, space_info, flush);
 
        if (used + bytes < writable_total_bytes(fs_info, space_info) + avail)
                return 1;