lkml.org 
[lkml]   [2021]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 08/50] btrfs: deal with errors when adding inode reference during log replay
    Date
    From: Filipe Manana <fdmanana@suse.com>

    commit 52db77791fe24538c8aa2a183248399715f6b380 upstream.

    At __inode_add_ref(), we treating any error returned from
    btrfs_lookup_dir_item() or from btrfs_lookup_dir_index_item() as meaning
    that there is no existing directory entry in the fs/subvolume tree.
    This is not correct since we can get errors such as, for example, -EIO
    when reading extent buffers while searching the fs/subvolume's btree.

    So fix that and return the error to the caller when it is not -ENOENT.

    CC: stable@vger.kernel.org # 4.14+
    Signed-off-by: Filipe Manana <fdmanana@suse.com>
    Reviewed-by: David Sterba <dsterba@suse.com>
    Signed-off-by: David Sterba <dsterba@suse.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/btrfs/tree-log.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    --- a/fs/btrfs/tree-log.c
    +++ b/fs/btrfs/tree-log.c
    @@ -1141,7 +1141,10 @@ next:
    /* look for a conflicting sequence number */
    di = btrfs_lookup_dir_index_item(trans, root, path, btrfs_ino(dir),
    ref_index, name, namelen, 0);
    - if (di && !IS_ERR(di)) {
    + if (IS_ERR(di)) {
    + if (PTR_ERR(di) != -ENOENT)
    + return PTR_ERR(di);
    + } else if (di) {
    ret = drop_one_dir_item(trans, root, path, dir, di);
    if (ret)
    return ret;
    @@ -1151,7 +1154,9 @@ next:
    /* look for a conflicing name */
    di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(dir),
    name, namelen, 0);
    - if (di && !IS_ERR(di)) {
    + if (IS_ERR(di)) {
    + return PTR_ERR(di);
    + } else if (di) {
    ret = drop_one_dir_item(trans, root, path, dir, di);
    if (ret)
    return ret;

    \
     
     \ /
      Last update: 2021-10-18 15:40    [W:3.120 / U:22.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site