]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
btrfs: use btrfs_tree_read_lock in btrfs_search_slot
authorJosef Bacik <josef@toxicpanda.com>
Fri, 6 Nov 2020 21:27:34 +0000 (16:27 -0500)
committerDavid Sterba <dsterba@suse.com>
Tue, 8 Dec 2020 14:54:09 +0000 (15:54 +0100)
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>
fs/btrfs/ctree.c

index 8148007fa259ae5ddafe4c495479d230c9a0351f..778a6d580545b5e0fcde9a64220d41b35834d96a 100644 (file)
@@ -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;