diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2020-08-20 17:46:10 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-12-08 15:54:01 +0100 |
| commit | ac5887c8e013d6754d36e6d51dc03448ee0b0065 (patch) | |
| tree | fa8e936af2eaf48321a72e6498c02280235b964c /fs/btrfs/backref.c | |
| parent | btrfs: scrub: remove local copy of csum_size from context (diff) | |
| download | linux-ac5887c8e013d6754d36e6d51dc03448ee0b0065.tar.xz linux-ac5887c8e013d6754d36e6d51dc03448ee0b0065.zip | |
btrfs: locking: remove all the blocking helpers
Now that we're using a rw_semaphore we no longer need to indicate if a
lock is blocking or not, nor do we need to flip the entire path from
blocking to spinning. Remove these helpers and all the places they are
called.
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/backref.c')
| -rw-r--r-- | fs/btrfs/backref.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 771a036867dc..deef23b36c5b 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -1341,14 +1341,12 @@ again: goto out; } - if (!path->skip_locking) { + if (!path->skip_locking) btrfs_tree_read_lock(eb); - btrfs_set_lock_blocking_read(eb); - } ret = find_extent_in_eb(eb, bytenr, *extent_item_pos, &eie, ignore_offset); if (!path->skip_locking) - btrfs_tree_read_unlock_blocking(eb); + btrfs_tree_read_unlock(eb); free_extent_buffer(eb); if (ret < 0) goto out; @@ -1685,7 +1683,7 @@ char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path, name_off, name_len); if (eb != eb_in) { if (!path->skip_locking) - btrfs_tree_read_unlock_blocking(eb); + btrfs_tree_read_unlock(eb); free_extent_buffer(eb); } ret = btrfs_find_item(fs_root, path, parent, 0, @@ -1705,8 +1703,6 @@ char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path, eb = path->nodes[0]; /* make sure we can use eb after releasing the path */ if (eb != eb_in) { - if (!path->skip_locking) - btrfs_set_lock_blocking_read(eb); path->nodes[0] = NULL; path->locks[0] = 0; } |