On Tue, Jan 30, 2018 at 2:32 PM, Nikolay Borisov <nborisov@xxxxxxxx> wrote:
> Essentially duplicate the error handling from the above block which
> handles the !PageUptodate(page) case and additionally clear
> EXTENT_BOUNDARY.
>
> Signed-off-by: Nikolay Borisov <nborisov@xxxxxxxx>
> Reviewed-by: Josef Bacik <jbacik@xxxxxx>
> ---
>
> Put description of the intended changes.
>
> fs/btrfs/relocation.c | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> index f0c3f00e97cb..8b2a31cef5cf 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -3268,12 +3268,25 @@ static int relocate_file_extent_cluster(struct inode *inode,
> nr++;
> }
>
> - btrfs_set_extent_delalloc(inode, page_start, page_end, 0, NULL,
> - 0);
> + ret = btrfs_set_extent_delalloc(inode, page_start, page_end, 0,
> + NULL, 0);
> + if (ret) {
> + unlock_page(page);
> + put_page(page);
> + btrfs_delalloc_release_metadata(BTRFS_I(inode),
> + PAGE_SIZE);
> + btrfs_delalloc_release_extents(BTRFS_I(inode),
> + PAGE_SIZE);
> +
> + clear_extent_bits(&BTRFS_I(inode)->io_tree,
> + page_start, page_end,
> + EXTENT_LOCKED | EXTENT_BOUNDARY);
> + goto out;
> +
> + }
> set_page_dirty(page);
>
> - unlock_extent(&BTRFS_I(inode)->io_tree,
> - page_start, page_end);
> + unlock_extent(&BTRFS_I(inode)->io_tree, page_start, page_end);
This is an unrelated change. Please don't mix pure white
space/indentation changes with functional changes.
> unlock_page(page);
> put_page(page);
>
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Filipe David Manana,
“Whether you think you can, or you think you can't — you're right.”
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
