summaryrefslogtreecommitdiff
path: root/fs/btrfs/locking.h
diff options
context:
space:
mode:
authorJosef Bacik <josef@toxicpanda.com>2020-11-07 00:27:33 +0300
committerDavid Sterba <dsterba@suse.com>2020-12-08 17:54:09 +0300
commit1bb96598410ccd52f4224e5584b8015c6d61b81f (patch)
tree77adb6245a2a98202d4005567ddb110617655935 /fs/btrfs/locking.h
parent4048daedb910f83f080c6bb03c78af794aebdff5 (diff)
downloadlinux-1bb96598410ccd52f4224e5584b8015c6d61b81f.tar.xz
btrfs: merge back btrfs_read_lock_root_node helpers
We no longer have recursive locking and there's no need for separate helpers that allowed the transition to rwsem with minimal code changes. Reviewed-by: Filipe Manana <fdmanana@suse.com> 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/locking.h')
-rw-r--r--fs/btrfs/locking.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/btrfs/locking.h b/fs/btrfs/locking.h
index f8f2fd835582..91441e31db18 100644
--- a/fs/btrfs/locking.h
+++ b/fs/btrfs/locking.h
@@ -94,13 +94,7 @@ void btrfs_tree_read_unlock(struct extent_buffer *eb);
int btrfs_try_tree_read_lock(struct extent_buffer *eb);
int btrfs_try_tree_write_lock(struct extent_buffer *eb);
struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root);
-struct extent_buffer *__btrfs_read_lock_root_node(struct btrfs_root *root,
- bool recurse);
-
-static inline struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root)
-{
- return __btrfs_read_lock_root_node(root, false);
-}
+struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root);
#ifdef CONFIG_BTRFS_DEBUG
static inline void btrfs_assert_tree_locked(struct extent_buffer *eb) {