btrfs: add nesting tags to the locking helpers

[sfrench/cifs-2.6.git] / fs / btrfs / locking.c

diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c
index 740a0cde57314e8104caf82e8142a56982bf223f..66e02ebdd340890affc90063b12dd687ad995a0a 100644 (file)
--- a/fs/btrfs/locking.c
+++ b/fs/btrfs/locking.c
@@ -244,7 +244,8 @@ void btrfs_set_lock_blocking_write(struct extent_buffer *eb)
  *
  * The rwlock is held upon exit.
  */
-void __btrfs_tree_read_lock(struct extent_buffer *eb, bool recurse)
+void __btrfs_tree_read_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest,
+                           bool recurse)
 {
        u64 start_ns = 0;
 
@@ -282,7 +283,7 @@ again:
 
 void btrfs_tree_read_lock(struct extent_buffer *eb)
 {
-       __btrfs_tree_read_lock(eb, false);
+       __btrfs_tree_read_lock(eb, BTRFS_NESTING_NORMAL, false);
 }
 
 /*
@@ -415,7 +416,7 @@ void btrfs_tree_read_unlock_blocking(struct extent_buffer *eb)
  *
  * The rwlock is held for write upon exit.
  */
-void btrfs_tree_lock(struct extent_buffer *eb)
+void __btrfs_tree_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest)
        __acquires(&eb->lock)
 {
        u64 start_ns = 0;
@@ -440,6 +441,11 @@ again:
        trace_btrfs_tree_lock(eb, start_ns);
 }
 
+void btrfs_tree_lock(struct extent_buffer *eb)
+{
+       __btrfs_tree_lock(eb, BTRFS_NESTING_NORMAL);
+}
+
 /*
  * Release the write lock, either blocking or spinning (ie. there's no need
  * for an explicit blocking unlock, like btrfs_tree_read_unlock_blocking).
@@ -565,7 +571,7 @@ struct extent_buffer *__btrfs_read_lock_root_node(struct btrfs_root *root,
 
        while (1) {
                eb = btrfs_root_node(root);
-               __btrfs_tree_read_lock(eb, recurse);
+               __btrfs_tree_read_lock(eb, BTRFS_NESTING_NORMAL, recurse);
                if (eb == root->node)
                        break;
                btrfs_tree_read_unlock(eb);