Re: [PATCH] btrfs: Don't panic when we can't find a root key

From: Filipe Manana <fdmanana@gmail.com>
To: Qu Wenruo <wqu@suse.com>
Cc: linux-btrfs <linux-btrfs@vger.kernel.org>
Subject: Re: [PATCH] btrfs: Don't panic when we can't find a root key
Date: Mon, 25 Feb 2019 09:57:12 +0000	[thread overview]
Message-ID: <CAL3q7H5cmpdeJ8o10ZHvShriSwNpCAxo1dbLbZHTEUXrZafsGQ@mail.gmail.com> (raw)
In-Reply-To: <20190225051106.22091-1-wqu@suse.com>

On Mon, Feb 25, 2019 at 5:12 AM Qu Wenruo <wqu@suse.com> wrote:
>
> When we failed to find a root key in btrfs_update_root(), we just panic.
>
> That's definitely not cool, fix it by aborting current transaction and
> return an error value.
>
> Signed-off-by: Qu Wenruo <wqu@suse.com>

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

> ---
>  fs/btrfs/root-tree.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
> index 65bda0682928..c48a3e18866d 100644
> --- a/fs/btrfs/root-tree.c
> +++ b/fs/btrfs/root-tree.c
> @@ -137,11 +137,15 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
>                 goto out;
>         }
>
> -       if (ret != 0) {
> +       if (ret > 0) {
>                 btrfs_print_leaf(path->nodes[0]);
> -               btrfs_crit(fs_info, "unable to update root key %llu %u %llu",
> -                          key->objectid, key->type, key->offset);
> -               BUG_ON(1);
> +               btrfs_crit(fs_info,
> +                       "unable to find root key (%llu %u %llu) in tree %llu",
> +                          key->objectid, key->type, key->offset,
> +                          root->root_key.objectid);
> +               ret = -ENOENT;
> +               btrfs_abort_transaction(trans, ret);
> +               goto out;
>         }
>
>         l = path->nodes[0];
> --
> 2.20.1
>

-- 
Filipe David Manana,

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