diff options
| author | Josef Bacik | 2020-11-06 16:27:33 -0500 |
|---|---|---|
| committer | David Sterba | 2020-12-08 15:54:09 +0100 |
| commit | 1bb96598410ccd52f4224e5584b8015c6d61b81f (patch) | |
| tree | 77adb6245a2a98202d4005567ddb110617655935 | |
| parent | 4048daedb910f83f080c6bb03c78af794aebdff5 (diff) | |
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>
| -rw-r--r-- | fs/btrfs/ctree.c | 2 | ||||
| -rw-r--r-- | fs/btrfs/locking.c | 5 | ||||
| -rw-r--r-- | fs/btrfs/locking.h | 8 |
3 files changed, 4 insertions, 11 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 2a53887a6db7..8148007fa259 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -2533,7 +2533,7 @@ static struct extent_buffer *btrfs_search_slot_get_root(struct btrfs_root *root, * We don't know the level of the root node until we actually * have it read locked */ - b = __btrfs_read_lock_root_node(root, 0); + b = btrfs_read_lock_root_node(root); level = btrfs_header_level(b); if (level > write_lock_level) goto out; diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c index 1e36a66fcefa..4190b824eca6 100644 --- a/fs/btrfs/locking.c +++ b/fs/btrfs/locking.c @@ -184,14 +184,13 @@ struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root) * * Return: root extent buffer with read lock held */ -struct extent_buffer *__btrfs_read_lock_root_node(struct btrfs_root *root, - bool recurse) +struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root) { struct extent_buffer *eb; while (1) { eb = btrfs_root_node(root); - __btrfs_tree_read_lock(eb, BTRFS_NESTING_NORMAL, recurse); + btrfs_tree_read_lock(eb); if (eb == root->node) break; btrfs_tree_read_unlock(eb); 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) { |