lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 165/274] xfs: clean up the error handling in xfs_swap_extents
    Date
    From: "Darrick J. Wong" <darrick.wong@oracle.com>

    [ Upstream commit 8bc3b5e4b70d28f8edcafc3c9e4de515998eea9e ]

    Make sure we release resources properly if we cannot clean out the COW
    extents in preparation for an extent swap.

    Fixes: 96987eea537d6c ("xfs: cancel COW blocks before swapext")
    Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/xfs/xfs_bmap_util.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
    index 4f800f7fe888..cc23a3e23e2d 100644
    --- a/fs/xfs/xfs_bmap_util.c
    +++ b/fs/xfs/xfs_bmap_util.c
    @@ -1606,7 +1606,7 @@ xfs_swap_extents(
    if (xfs_inode_has_cow_data(tip)) {
    error = xfs_reflink_cancel_cow_range(tip, 0, NULLFILEOFF, true);
    if (error)
    - return error;
    + goto out_unlock;
    }

    /*
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:54    [W:2.668 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site