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

btrfs: make btrfs_set_extent_delalloc take btrfs_inode 



Preparation to make btrfs_dirty_pages take btrfs_inode as parameter.

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 cd4c0bf9

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -2926,7 +2926,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, 


int btrfs_start_delalloc_snapshot(struct btrfs_root *root);

int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int nr);

int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end,

int btrfs_set_extent_delalloc(struct btrfs_inode *inode, u64 start, u64 end,

			      unsigned int extra_bits,

			      struct extent_state **cached_state);

int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ int btrfs_dirty_pages(struct inode *inode, struct page **pages, 
		}

	}



	err = btrfs_set_extent_delalloc(inode, start_pos, end_of_last_block,

	err = btrfs_set_extent_delalloc(BTRFS_I(inode), start_pos, end_of_last_block,

					extra_bits, cached);

	if (err)

		return err;

fs/btrfs/inode.c

+6 −6
Original line number Diff line number Diff line
@@ -2260,13 +2260,13 @@ static noinline int add_pending_csums(struct btrfs_trans_handle *trans, 
	return 0;

}



int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end,

int btrfs_set_extent_delalloc(struct btrfs_inode *inode, u64 start, u64 end,

			      unsigned int extra_bits,

			      struct extent_state **cached_state)

{

	WARN_ON(PAGE_ALIGNED(end));

	return set_extent_delalloc(&BTRFS_I(inode)->io_tree, start, end,

				   extra_bits, cached_state);

	return set_extent_delalloc(&inode->io_tree, start, end, extra_bits,

				   cached_state);

}



/* see btrfs_writepage_start_hook for details on why this is required */
@@ -2363,7 +2363,7 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work) 
		goto again;

	}



	ret = btrfs_set_extent_delalloc(inode, page_start, page_end, 0,

	ret = btrfs_set_extent_delalloc(BTRFS_I(inode), page_start, page_end, 0,

					&cached_state);

	if (ret)

		goto out_reserved;
@@ -4581,7 +4581,7 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, 
			 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,

			 0, 0, &cached_state);



	ret = btrfs_set_extent_delalloc(inode, block_start, block_end, 0,

	ret = btrfs_set_extent_delalloc(BTRFS_I(inode), block_start, block_end, 0,

					&cached_state);

	if (ret) {

		unlock_extent_cached(io_tree, block_start, block_end,
@@ -8296,7 +8296,7 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf) 
			  EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |

			  EXTENT_DEFRAG, 0, 0, &cached_state);



	ret2 = btrfs_set_extent_delalloc(inode, page_start, end, 0,

	ret2 = btrfs_set_extent_delalloc(BTRFS_I(inode), page_start, end, 0,

					&cached_state);

	if (ret2) {

		unlock_extent_cached(io_tree, page_start, page_end,

fs/btrfs/reflink.c

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ static int copy_inline_to_page(struct inode *inode, 
	clear_extent_bit(&BTRFS_I(inode)->io_tree, file_offset, range_end,

			 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,

			 0, 0, NULL);

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

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

					0, NULL);

	if (ret)

		goto out_unlock;

fs/btrfs/relocation.c

+2 −2
Original line number Diff line number Diff line
@@ -2754,8 +2754,8 @@ static int relocate_file_extent_cluster(struct inode *inode, 
			nr++;

		}



		ret = btrfs_set_extent_delalloc(inode, page_start, page_end, 0,

						NULL);

		ret = btrfs_set_extent_delalloc(BTRFS_I(inode), page_start,

						page_end, 0, NULL);

		if (ret) {

			unlock_page(page);

			put_page(page);