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

btrfs: make btrfs_lookup_ordered_extent take btrfs_inode 



It doesn't use the generic vfs inode for anything use btrfs_inode
directly.

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 43c69849

fs/btrfs/file-item.c

+3 −2
Original line number Diff line number Diff line
@@ -522,10 +522,11 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end, 
 *		 means this bio can contains potentially discontigous bio vecs

 *		 so the logical offset of each should be calculated separately.

 */

blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio,

blk_status_t btrfs_csum_one_bio(struct inode *vfsinode, struct bio *bio,

		       u64 file_start, int contig)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	struct btrfs_inode *inode = BTRFS_I(vfsinode);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	SHASH_DESC_ON_STACK(shash, fs_info->csum_shash);

	struct btrfs_ordered_sum *sums;

	struct btrfs_ordered_extent *ordered = NULL;

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -4558,7 +4558,7 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, 
	lock_extent_bits(io_tree, block_start, block_end, &cached_state);

	set_page_extent_mapped(page);



	ordered = btrfs_lookup_ordered_extent(inode, block_start);

	ordered = btrfs_lookup_ordered_extent(BTRFS_I(inode), block_start);

	if (ordered) {

		unlock_extent_cached(io_tree, block_start, block_end,

				     &cached_state);

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ static int cluster_pages_for_defrag(struct inode *inode, 
		while (1) {

			lock_extent_bits(tree, page_start, page_end,

					 &cached_state);

			ordered = btrfs_lookup_ordered_extent(inode,

			ordered = btrfs_lookup_ordered_extent(BTRFS_I(inode),

							      page_start);

			unlock_extent_cached(tree, page_start, page_end,

					     &cached_state);

fs/btrfs/ordered-data.c

+3 −3
Original line number Diff line number Diff line
@@ -714,14 +714,14 @@ int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len) 
 * find an ordered extent corresponding to file_offset.  return NULL if

 * nothing is found, otherwise take a reference on the extent and return it

 */

struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct inode *inode,

struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *inode,

							 u64 file_offset)

{

	struct btrfs_ordered_inode_tree *tree;

	struct rb_node *node;

	struct btrfs_ordered_extent *entry = NULL;



	tree = &BTRFS_I(inode)->ordered_tree;

	tree = &inode->ordered_tree;

	spin_lock_irq(&tree->lock);

	node = tree_search(tree, file_offset);

	if (!node)
@@ -819,7 +819,7 @@ int btrfs_find_ordered_sum(struct inode *inode, u64 offset, u64 disk_bytenr, 
	const u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);

	int index = 0;



	ordered = btrfs_lookup_ordered_extent(inode, offset);

	ordered = btrfs_lookup_ordered_extent(BTRFS_I(inode), offset);

	if (!ordered)

		return 0;

fs/btrfs/ordered-data.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset, 
				      int compress_type);

void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,

			   struct btrfs_ordered_sum *sum);

struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct inode *inode,

struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *inode,

							 u64 file_offset);

void btrfs_start_ordered_extent(struct inode *inode,

				struct btrfs_ordered_extent *entry, int wait);