diff options
| author |   Josef Bacik <josef@toxicpanda.com> | 2022-09-09 17:53:43 -0400 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2022-09-26 12:28:05 +0200 |
| commit | 570eb97bace8743f45c6830b64c7a0889d0915dd (patch) | |
| tree | dd6e39e3006b7a4c91abe461074e9fed4e2aa559 /fs/btrfs/disk-io.c | |
| parent | btrfs: drop extent_changeset from set_extent_bit (diff) | |
| download | linux-dev-570eb97bace8743f45c6830b64c7a0889d0915dd.tar.xz linux-dev-570eb97bace8743f45c6830b64c7a0889d0915dd.zip | |
btrfs: unify the lock/unlock extent variants
We have two variants of lock/unlock extent, one set that takes a cached
state, another that does not. This is slightly annoying, and generally
speaking there are only a few places where we don't have a cached state.
Simplify this by making lock_extent/unlock_extent the only variant and
make it take a cached state, then convert all the callers appropriately.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 0d33d771cee3..f0176b3fdad8 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -131,8 +131,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree, if (atomic) return -EAGAIN; - lock_extent_bits(io_tree, eb->start, eb->start + eb->len - 1, - &cached_state); + lock_extent(io_tree, eb->start, eb->start + eb->len - 1, &cached_state); if (extent_buffer_uptodate(eb) && btrfs_header_generation(eb) == parent_transid) { ret = 0; @@ -145,8 +144,8 @@ static int verify_parent_transid(struct extent_io_tree *io_tree, ret = 1; clear_extent_buffer_uptodate(eb); out: - unlock_extent_cached(io_tree, eb->start, eb->start + eb->len - 1, - &cached_state); + unlock_extent(io_tree, eb->start, eb->start + eb->len - 1, + &cached_state); return ret; } |