lkml.org 
[lkml]   [2017]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.8 30/85] Btrfs: return gracefully from balance if fs tree is corrupted
    Date
    4.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Liu Bo <bo.li.liu@oracle.com>

    commit 3561b9db70928f207be4570b48fc19898eeaef54 upstream.

    When relocating tree blocks, we firstly get block information from
    back references in the extent tree, we then search fs tree to try to
    find all parents of a block.

    However, if fs tree is corrupted, eg. if there're some missing
    items, we could come across these WARN_ONs and BUG_ONs.

    This makes us print some error messages and return gracefully
    from balance.

    Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
    Reviewed-by: Josef Bacik <jbacik@fb.com>
    Signed-off-by: David Sterba <dsterba@suse.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/btrfs/relocation.c | 23 +++++++++++++++++------
    1 file changed, 17 insertions(+), 6 deletions(-)

    --- a/fs/btrfs/relocation.c
    +++ b/fs/btrfs/relocation.c
    @@ -923,9 +923,16 @@ again:
    path2->slots[level]--;

    eb = path2->nodes[level];
    - WARN_ON(btrfs_node_blockptr(eb, path2->slots[level]) !=
    - cur->bytenr);
    -
    + if (btrfs_node_blockptr(eb, path2->slots[level]) !=
    + cur->bytenr) {
    + btrfs_err(root->fs_info,
    + "couldn't find block (%llu) (level %d) in tree (%llu) with key (%llu %u %llu)",
    + cur->bytenr, level - 1, root->objectid,
    + node_key->objectid, node_key->type,
    + node_key->offset);
    + err = -ENOENT;
    + goto out;
    + }
    lower = cur;
    need_check = true;
    for (; level < BTRFS_MAX_LEVEL; level++) {
    @@ -2695,11 +2702,15 @@ static int do_relocation(struct btrfs_tr

    if (!upper->eb) {
    ret = btrfs_search_slot(trans, root, key, path, 0, 1);
    - if (ret < 0) {
    - err = ret;
    + if (ret) {
    + if (ret < 0)
    + err = ret;
    + else
    + err = -ENOENT;
    +
    + btrfs_release_path(path);
    break;
    }
    - BUG_ON(ret > 0);

    if (!upper->eb) {
    upper->eb = path->nodes[upper->level];

    \
     
     \ /
      Last update: 2017-01-04 22:12    [W:4.064 / U:1.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site