lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 143/161] btrfs: abort transaction after failed inode updates in create_subvol
    Date
    From: Josef Bacik <josef@toxicpanda.com>

    [ Upstream commit c7e54b5102bf3614cadb9ca32d7be73bad6cecf0 ]

    We can just abort the transaction here, and in fact do that for every
    other failure in this function except these two cases.

    CC: stable@vger.kernel.org # 4.4+
    Reviewed-by: Filipe Manana <fdmanana@suse.com>
    Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
    Signed-off-by: Josef Bacik <josef@toxicpanda.com>
    Reviewed-by: David Sterba <dsterba@suse.com>
    Signed-off-by: David Sterba <dsterba@suse.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/btrfs/ioctl.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
    index dd3b4820ac30..e82b4f3f490c 100644
    --- a/fs/btrfs/ioctl.c
    +++ b/fs/btrfs/ioctl.c
    @@ -580,12 +580,18 @@ static noinline int create_subvol(struct inode *dir,

    btrfs_i_size_write(BTRFS_I(dir), dir->i_size + namelen * 2);
    ret = btrfs_update_inode(trans, root, dir);
    - BUG_ON(ret);
    + if (ret) {
    + btrfs_abort_transaction(trans, ret);
    + goto fail;
    + }

    ret = btrfs_add_root_ref(trans, fs_info,
    objectid, root->root_key.objectid,
    btrfs_ino(BTRFS_I(dir)), index, name, namelen);
    - BUG_ON(ret);
    + if (ret) {
    + btrfs_abort_transaction(trans, ret);
    + goto fail;
    + }

    ret = btrfs_uuid_tree_add(trans, fs_info, root_item->uuid,
    BTRFS_UUID_KEY_SUBVOL, objectid);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 19:15    [W:4.094 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site