From: Josef Bacik Date: Fri, 5 Jul 2013 21:05:38 +0000 (-0400) Subject: Btrfs: set lockdep class before locking new extent buffer X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~15867^2~115 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b2aaaa3b8c2153ef17f0e22287acbf8ee31a7c82;p=mirror_ubuntu-focal-kernel.git Btrfs: set lockdep class before locking new extent buffer We've been seeing spurious complaints out of lockdep because the lock class name changes. This is happening because when we drop a snapshot we will lock a block before we've read it in, which sets the lockdep class to whatever the default is. Then once we read the thing in we reset the lockdep class to what it is supposed to be, which blows lockdeps' mind. This patch should fix the problem, it appears to be the only place where we do this sort of thing. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason --- diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 1204c8ef6f32..7e172c6dba68 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -7173,6 +7173,8 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, next = btrfs_find_create_tree_block(root, bytenr, blocksize); if (!next) return -ENOMEM; + btrfs_set_buffer_lockdep_class(root->root_key.objectid, next, + level - 1); reada = 1; } btrfs_tree_lock(next);