[PATCH 18/23] btrfs: drop the commit_cycles stuff for data reservations

Josef Bacik
2020-02-04T16:20:26Z

This was an old wart left over from how we previously did data
reservations. Before we could have people race in and take a
reservation while we were flushing space, so we needed to make sure we
looped a few times before giving up. Now that we're using the ticketing
infrastructure we don't have to worry about this and can drop the logic
altogether.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Tested-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/space-info.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 225f7f8a0503..8c5543328ec4 100644
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -859,7 +859,6 @@ static void priority_reclaim_data_space(struct btrfs_fs_info *fs_info,
int states_nr)
{
int flush_state = 0;
- int commit_cycles = 2;

while (!space_info->full) {
flush_space(fs_info, space_info, U64_MAX, ALLOC_CHUNK_FORCE);
@@ -870,21 +869,9 @@ static void priority_reclaim_data_space(struct btrfs_fs_info *fs_info,
}
spin_unlock(&space_info->lock);
}
-again:
- while (flush_state < states_nr) {
- u64 flush_bytes = U64_MAX;
-
- if (!commit_cycles) {
- if (states[flush_state] == FLUSH_DELALLOC_WAIT) {
- flush_state++;
- continue;
- }
- if (states[flush_state] == COMMIT_TRANS)
- flush_bytes = ticket->bytes;
- }

- flush_space(fs_info, space_info, flush_bytes,
- states[flush_state]);
+ while (flush_state < states_nr) {
+ flush_space(fs_info, space_info, U64_MAX, states[flush_state]);
spin_lock(&space_info->lock);
if (ticket->bytes == 0) {
spin_unlock(&space_info->lock);
@@ -893,11 +880,6 @@ static void priority_reclaim_data_space(struct btrfs_fs_info *fs_info,
spin_unlock(&space_info->lock);
flush_state++;
}
- if (commit_cycles) {
- commit_cycles--;
- flush_state = 0;
- goto again;
- }
}

static void wait_reserve_ticket(struct btrfs_fs_info *fs_info,
--
2.24.1