[PATCH v3 3/7] btrfs: check ticket->steal in steal_from_global_block_rsv
From: Josef Bacik <josef@toxicpanda.com>
Date: 2021-11-09 15:12:17
Subsystem:
btrfs file system, filesystems (vfs and infrastructure), the rest · Maintainers:
Chris Mason, David Sterba, Alexander Viro, Christian Brauner, Linus Torvalds
We're going to use this helper in the priority flushing loop, move this check into the helper to simplify the logic. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- fs/btrfs/space-info.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 9a362f3a6df4..6498e79d4c9b 100644
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c@@ -844,6 +844,9 @@ static bool steal_from_global_rsv(struct btrfs_fs_info *fs_info, struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv; u64 min_bytes; + if (!ticket->steal) + return false; + if (global_rsv->space_info != space_info) return false;
@@ -899,8 +902,8 @@ static bool maybe_fail_all_tickets(struct btrfs_fs_info *fs_info, ticket = list_first_entry(&space_info->tickets, struct reserve_ticket, list); - if (!aborted && ticket->steal && - steal_from_global_rsv(fs_info, space_info, ticket)) + if (!aborted && steal_from_global_rsv(fs_info, space_info, + ticket)) return true; if (!aborted && btrfs_test_opt(fs_info, ENOSPC_DEBUG))
--
2.26.3