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/tree-log.c | |
| parent | 291bbb1e7ea84ef2aba3a5756b9c573d2c572bd7 (diff) | |
| download | lwn-570eb97bace8743f45c6830b64c7a0889d0915dd.tar.gz lwn-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/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 020e01ea44bc..b5018e42cf06 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -4271,8 +4271,8 @@ static int log_csums(struct btrfs_trans_handle *trans, * file which happens to refer to the same extent as well. Such races * can leave checksum items in the log with overlapping ranges. */ - ret = lock_extent_bits(&log_root->log_csum_range, sums->bytenr, - lock_end, &cached_state); + ret = lock_extent(&log_root->log_csum_range, sums->bytenr, lock_end, + &cached_state); if (ret) return ret; /* @@ -4288,8 +4288,8 @@ static int log_csums(struct btrfs_trans_handle *trans, if (!ret) ret = btrfs_csum_file_blocks(trans, log_root, sums); - unlock_extent_cached(&log_root->log_csum_range, sums->bytenr, lock_end, - &cached_state); + unlock_extent(&log_root->log_csum_range, sums->bytenr, lock_end, + &cached_state); return ret; } |