lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 169/268] Btrfs: bail out on error during replay_dir_deletes
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Liu Bo <bo.liu@linux.alibaba.com>

    [ Upstream commit b98def7ca6e152ee55e36863dddf6f41f12d1dc6 ]

    If errors were returned by btrfs_next_leaf(), replay_dir_deletes needs
    to bail out, otherwise @ret would be forced to be 0 after 'break;' and
    the caller won't be aware of it.

    Fixes: e02119d5a7b4 ("Btrfs: Add a write ahead tree log to optimize synchronous operations")
    Reviewed-by: Nikolay Borisov <nborisov@suse.com>
    Signed-off-by: Liu Bo <bo.liu@linux.alibaba.com>
    Signed-off-by: David Sterba <dsterba@suse.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/btrfs/tree-log.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/fs/btrfs/tree-log.c
    +++ b/fs/btrfs/tree-log.c
    @@ -2223,8 +2223,10 @@ again:
    nritems = btrfs_header_nritems(path->nodes[0]);
    if (path->slots[0] >= nritems) {
    ret = btrfs_next_leaf(root, path);
    - if (ret)
    + if (ret == 1)
    break;
    + else if (ret < 0)
    + goto out;
    }
    btrfs_item_key_to_cpu(path->nodes[0], &found_key,
    path->slots[0]);

    \
     
     \ /
      Last update: 2018-05-28 17:20    [W:3.766 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site