Commit 998acfe8 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: make copy_inline_to_page take btrfs_inode 



Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3c5641a8

fs/btrfs/reflink.c

+19 −19
Original line number Diff line number Diff line
@@ -45,19 +45,20 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans, 
	return ret;

}



static int copy_inline_to_page(struct inode *inode,

static int copy_inline_to_page(struct btrfs_inode *inode,

			       const u64 file_offset,

			       char *inline_data,

			       const u64 size,

			       const u64 datal,

			       const u8 comp_type)

{

	const u64 block_size = btrfs_inode_sectorsize(BTRFS_I(inode));

	const u64 block_size = btrfs_inode_sectorsize(inode);

	const u64 range_end = file_offset + block_size - 1;

	const size_t inline_size = size - btrfs_file_extent_calc_inline_size(0);

	char *data_start = inline_data + btrfs_file_extent_calc_inline_size(0);

	struct extent_changeset *data_reserved = NULL;

	struct page *page = NULL;

	struct address_space *mapping = inode->vfs_inode.i_mapping;

	int ret;



	ASSERT(IS_ALIGNED(file_offset, block_size));
@@ -68,24 +69,23 @@ static int copy_inline_to_page(struct inode *inode, 
	 * reservation here. Also we must not do the reservation while holding

	 * a transaction open, otherwise we would deadlock.

	 */

	ret = btrfs_delalloc_reserve_space(BTRFS_I(inode), &data_reserved,

					   file_offset, block_size);

	ret = btrfs_delalloc_reserve_space(inode, &data_reserved, file_offset,

					   block_size);

	if (ret)

		goto out;



	page = find_or_create_page(inode->i_mapping, file_offset >> PAGE_SHIFT,

				   btrfs_alloc_write_mask(inode->i_mapping));

	page = find_or_create_page(mapping, file_offset >> PAGE_SHIFT,

				   btrfs_alloc_write_mask(mapping));

	if (!page) {

		ret = -ENOMEM;

		goto out_unlock;

	}



	set_page_extent_mapped(page);

	clear_extent_bit(&BTRFS_I(inode)->io_tree, file_offset, range_end,

	clear_extent_bit(&inode->io_tree, file_offset, range_end,

			 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,

			 0, 0, NULL);

	ret = btrfs_set_extent_delalloc(BTRFS_I(inode), file_offset, range_end,

					0, NULL);

	ret = btrfs_set_extent_delalloc(inode, file_offset, range_end, 0, NULL);

	if (ret)

		goto out_unlock;
@@ -134,9 +134,9 @@ static int copy_inline_to_page(struct inode *inode, 
		put_page(page);

	}

	if (ret)

		btrfs_delalloc_release_space(BTRFS_I(inode), data_reserved,

					     file_offset, block_size, true);

	btrfs_delalloc_release_extents(BTRFS_I(inode), block_size);

		btrfs_delalloc_release_space(inode, data_reserved, file_offset,

					     block_size, true);

	btrfs_delalloc_release_extents(inode, block_size);

out:

	extent_changeset_free(data_reserved);
@@ -167,8 +167,8 @@ static int clone_copy_inline_extent(struct inode *dst, 
	struct btrfs_key key;



	if (new_key->offset > 0) {

		ret = copy_inline_to_page(dst, new_key->offset, inline_data,

					  size, datal, comp_type);

		ret = copy_inline_to_page(BTRFS_I(dst), new_key->offset,

					  inline_data, size, datal, comp_type);

		goto out;

	}
@@ -194,7 +194,7 @@ static int clone_copy_inline_extent(struct inode *dst, 
			 * inline extent's data to the page.

			 */

			ASSERT(key.offset > 0);

			ret = copy_inline_to_page(dst, new_key->offset,

			ret = copy_inline_to_page(BTRFS_I(dst), new_key->offset,

						  inline_data, size, datal,

						  comp_type);

			goto out;
@@ -213,8 +213,8 @@ static int clone_copy_inline_extent(struct inode *dst, 
		    BTRFS_FILE_EXTENT_INLINE)

			goto copy_inline_extent;



		ret = copy_inline_to_page(dst, new_key->offset, inline_data,

					  size, datal, comp_type);

		ret = copy_inline_to_page(BTRFS_I(dst), new_key->offset,

					  inline_data, size, datal, comp_type);

		goto out;

	}
@@ -231,8 +231,8 @@ static int clone_copy_inline_extent(struct inode *dst, 
		 * clone. Deal with all these cases by copying the inline extent

		 * data into the respective page at the destination inode.

		 */

		ret = copy_inline_to_page(dst, new_key->offset, inline_data,

					   size, datal, comp_type);

		ret = copy_inline_to_page(BTRFS_I(dst), new_key->offset,

					  inline_data, size, datal, comp_type);

		goto out;

	}