From fd7ba1c1202d15ac96d7b42256550973e12686b5 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Thu, 20 Aug 2020 11:46:02 -0400 Subject: btrfs: add nesting tags to the locking helpers We will need these when we switch to an rwsem, so plumb in the infrastructure here to use later on. I violate the 80 character limit some here because it'll be cleaned up later. Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba --- fs/btrfs/ctree.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'fs/btrfs/ctree.c') diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 7c99bf112960..71e3fa30082c 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -2875,7 +2875,8 @@ cow_done: } else { if (!btrfs_tree_read_lock_atomic(b)) { btrfs_set_path_blocking(p); - __btrfs_tree_read_lock(b, p->recurse); + __btrfs_tree_read_lock(b, BTRFS_NESTING_NORMAL, + p->recurse); } p->locks[level] = BTRFS_READ_LOCK; } @@ -5453,7 +5454,9 @@ again: } if (!ret) { btrfs_set_path_blocking(path); - __btrfs_tree_read_lock(next, path->recurse); + __btrfs_tree_read_lock(next, + BTRFS_NESTING_NORMAL, + path->recurse); } next_rw_lock = BTRFS_READ_LOCK; } @@ -5488,7 +5491,9 @@ again: ret = btrfs_try_tree_read_lock(next); if (!ret) { btrfs_set_path_blocking(path); - __btrfs_tree_read_lock(next, path->recurse); + __btrfs_tree_read_lock(next, + BTRFS_NESTING_NORMAL, + path->recurse); } next_rw_lock = BTRFS_READ_LOCK; } -- cgit v1.2.3