Skip to content

Commit

Permalink
btrfs: tree-log: change how we wait on writeback
Browse files Browse the repository at this point in the history
This is used in the tree-log code and is a holdover from previous
iterations of extent buffer writeback.  We can simply use
wait_on_extent_buffer_writeback instead of filemap_fdatawait_range as it
waits for the same bit EXTENT_BUFFER_WRITEBACK, and remove
btrfs_wait_tree_block_writeback completely.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
josefbacik authored and kdave committed Dec 14, 2022
1 parent 924141f commit 811d6de
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions fs/btrfs/tree-log.c
Original file line number Diff line number Diff line change
@@ -279,12 +279,6 @@ void btrfs_end_log_trans(struct btrfs_root *root)
}
}

static void btrfs_wait_tree_block_writeback(struct extent_buffer *buf)
{
filemap_fdatawait_range(buf->pages[0]->mapping,
buf->start, buf->start + buf->len - 1);
}

/*
* the walk control struct is used to pass state down the chain when
* processing the log tree. The stage field tells us which part
@@ -2625,7 +2619,7 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,

btrfs_tree_lock(next);
btrfs_clear_buffer_dirty(next);
btrfs_wait_tree_block_writeback(next);
wait_on_extent_buffer_writeback(next);
btrfs_tree_unlock(next);

if (trans) {
@@ -2694,7 +2688,7 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,

btrfs_tree_lock(next);
btrfs_clear_buffer_dirty(next);
btrfs_wait_tree_block_writeback(next);
wait_on_extent_buffer_writeback(next);
btrfs_tree_unlock(next);

if (trans) {
@@ -2775,7 +2769,7 @@ static int walk_log_tree(struct btrfs_trans_handle *trans,

btrfs_tree_lock(next);
btrfs_clear_buffer_dirty(next);
btrfs_wait_tree_block_writeback(next);
wait_on_extent_buffer_writeback(next);
btrfs_tree_unlock(next);

if (trans) {

0 comments on commit 811d6de

Please sign in to comment.