commit 1bb96598410ccd52f4224e5584b8015c6d61b81f
author Josef Bacik <josef@toxicpanda.com> Fri Nov 06 16:27:33 2020 -0500
committer David Sterba <dsterba@suse.com> Tue Dec 08 15:54:09 2020 +0100
tree 77adb6245a2a98202d4005567ddb110617655935
parent 4048daedb910f83f080c6bb03c78af794aebdff5

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>

fs/btrfs/locking.c

diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c
index 1e36a66..4190b82 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);