Re: [PATCH 5/8] btrfs: remove __btrfs_read_lock_root_node

[Filipe Manana <fdmanana@gmail.com>]

On Fri, Nov 6, 2020 at 9:30 PM Josef Bacik <josef@toxicpanda.com> wrote:
>
> We no longer have recursive locking, so remove this variant.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>

Reviewed-by: Filipe Manana <fdmanana@suse.com>

Looks good, thanks.

> ---
>  fs/btrfs/ctree.c   | 2 +-
>  fs/btrfs/locking.c | 5 ++---
>  fs/btrfs/locking.h | 8 +-------
>  3 files changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
> index cdd86ced917a..ef7389e6be3d 100644
> --- a/fs/btrfs/ctree.c
> +++ b/fs/btrfs/ctree.c
> @@ -2588,7 +2588,7 @@ static struct extent_buffer *btrfs_search_slot_get_root(struct btrfs_root *root,
>                  * We don't know the level of the root node until we actually
>                  * have it read locked
>                  */
> -               b = __btrfs_read_lock_root_node(root, 0);
> +               b = btrfs_read_lock_root_node(root);
>                 level = btrfs_header_level(b);
>                 if (level > write_lock_level)
>                         goto out;
> diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c
> index 9b66154803a7..c8b239376fb4 100644
> --- a/fs/btrfs/locking.c
> +++ b/fs/btrfs/locking.c
> @@ -185,14 +185,13 @@ struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root)
>   *
>   * Return: root extent buffer with read lock held
>   */
> -struct extent_buffer *__btrfs_read_lock_root_node(struct btrfs_root *root,
> -                                                 bool recurse)
> +struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root)
>  {
>         struct extent_buffer *eb;
>
>         while (1) {
>                 eb = btrfs_root_node(root);
> -               __btrfs_tree_read_lock(eb, BTRFS_NESTING_NORMAL, recurse);
> +               btrfs_tree_read_lock(eb);
>                 if (eb == root->node)
>                         break;
>                 btrfs_tree_read_unlock(eb);
> diff --git a/fs/btrfs/locking.h b/fs/btrfs/locking.h
> index f8f2fd835582..91441e31db18 100644
> --- a/fs/btrfs/locking.h
> +++ b/fs/btrfs/locking.h
> @@ -94,13 +94,7 @@ void btrfs_tree_read_unlock(struct extent_buffer *eb);
>  int btrfs_try_tree_read_lock(struct extent_buffer *eb);
>  int btrfs_try_tree_write_lock(struct extent_buffer *eb);
>  struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root);
> -struct extent_buffer *__btrfs_read_lock_root_node(struct btrfs_root *root,
> -                                                 bool recurse);
> -
> -static inline struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root)
> -{
> -       return __btrfs_read_lock_root_node(root, false);
> -}
> +struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root);
>
>  #ifdef CONFIG_BTRFS_DEBUG
>  static inline void btrfs_assert_tree_locked(struct extent_buffer *eb) {
> --
> 2.26.2
>


-- 
Filipe David Manana,

“Whether you think you can, or you think you can't — you're right.”