From: Josef Bacik <josef@toxicpanda.com>
Date: Fri, 6 Nov 2020 21:27:34 +0000 (-0500)
Subject: btrfs: use btrfs_tree_read_lock in btrfs_search_slot
X-Git-Tag: io_uring-5.11-2020-12-23~54^2~88
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fe596ca3d3b5b005d940a20ee30a6f1c13dd2d19;p=linux-block.git

btrfs: use btrfs_tree_read_lock in btrfs_search_slot

We no longer use recursion, so
__btrfs_tree_read_lock(BTRFS_NESTING_NORMAL) == btrfs_tree_read_lock.
Replace this call with the simple helper.

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>
---

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 8148007fa259..778a6d580545 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -2802,7 +2802,7 @@ cow_done:
 				btrfs_tree_lock(b);
 				p->locks[level] = BTRFS_WRITE_LOCK;
 			} else {
-				__btrfs_tree_read_lock(b, BTRFS_NESTING_NORMAL, 0);
+				btrfs_tree_read_lock(b);
 				p->locks[level] = BTRFS_READ_LOCK;
 			}
 			p->nodes[level] = b;