Hi all, After merging the tip tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/btrfs/ctree.c: In function '__tree_mod_log_insert': fs/btrfs/ctree.c:388:2: error: implicit declaration of function 'lockdep_assert_held_exclusive'; did you mean 'lockdep_assert_held_once'? [-Werror=implicit-function-declaration] lockdep_assert_held_exclusive(&fs_info->tree_mod_log_lock); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ lockdep_assert_held_once Caused by commit 9ffbe8ac05db ("locking/lockdep: Rename lockdep_assert_held_exclusive() -> lockdep_assert_held_write()") interacting with commits 84cd7723de7c ("btrfs: assert tree mod log lock in __tree_mod_log_insert") 283d2e443505 ("btrfs: assert extent map tree lock in add_extent_mapping") from the btrfs-kdave tree. I have applied the following merge fix patch: From: Stephen Rothwell Date: Tue, 2 Jul 2019 15:29:27 +1000 Subject: [PATCH] locking/lockdep: fix up for "Rename lockdep_assert_held_exclusive() -> lockdep_assert_held_write()" Signed-off-by: Stephen Rothwell --- fs/btrfs/ctree.c | 2 +- fs/btrfs/extent_map.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 99a585ede79d..9d1d0a926cb0 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -385,7 +385,7 @@ __tree_mod_log_insert(struct btrfs_fs_info *fs_info, struct tree_mod_elem *tm) struct rb_node *parent = NULL; struct tree_mod_elem *cur; - lockdep_assert_held_exclusive(&fs_info->tree_mod_log_lock); + lockdep_assert_held_write(&fs_info->tree_mod_log_lock); tm->seq = btrfs_inc_tree_mod_seq(fs_info); diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index a73af4159495..9d30acca55e1 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -384,7 +384,7 @@ int add_extent_mapping(struct extent_map_tree *tree, { int ret = 0; - lockdep_assert_held_exclusive(&tree->lock); + lockdep_assert_held_write(&tree->lock); ret = tree_insert(&tree->map, em); if (ret) -- 2.20.1 -- Cheers, Stephen Rothwell