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

btrfs: make btrfs_lookup_first_ordered_extent 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 b79b7249

fs/btrfs/file.c

+4 −2
Original line number Diff line number Diff line
@@ -2541,7 +2541,8 @@ static int btrfs_punch_hole_lock_range(struct inode *inode, 


		lock_extent_bits(&BTRFS_I(inode)->io_tree, lockstart, lockend,

				 cached_state);

		ordered = btrfs_lookup_first_ordered_extent(inode, lockend);

		ordered = btrfs_lookup_first_ordered_extent(BTRFS_I(inode),

							    lockend);



		/*

		 * We need to make sure we have no ordered extents in this range
@@ -3400,7 +3401,8 @@ static long btrfs_fallocate(struct file *file, int mode, 
		 */

		lock_extent_bits(&BTRFS_I(inode)->io_tree, alloc_start,

				 locked_end, &cached_state);

		ordered = btrfs_lookup_first_ordered_extent(inode, locked_end);

		ordered = btrfs_lookup_first_ordered_extent(BTRFS_I(inode),

							    locked_end);



		if (ordered &&

		    ordered->file_offset + ordered->num_bytes > alloc_start &&

fs/btrfs/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -8672,7 +8672,8 @@ void btrfs_destroy_inode(struct inode *inode) 
		return;



	while (1) {

		ordered = btrfs_lookup_first_ordered_extent(inode, (u64)-1);

		ordered = btrfs_lookup_first_ordered_extent(BTRFS_I(inode),

							    (u64)-1);

		if (!ordered)

			break;

		else {

fs/btrfs/ordered-data.c

+3 −3
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len) 


	end = orig_end;

	while (1) {

		ordered = btrfs_lookup_first_ordered_extent(inode, end);

		ordered = btrfs_lookup_first_ordered_extent(BTRFS_I(inode), end);

		if (!ordered)

			break;

		if (ordered->file_offset > orig_end) {
@@ -838,13 +838,13 @@ void btrfs_get_ordered_extents_for_logging(struct btrfs_inode *inode, 
 * if none is found

 */

struct btrfs_ordered_extent *

btrfs_lookup_first_ordered_extent(struct inode *inode, u64 file_offset)

btrfs_lookup_first_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)

fs/btrfs/ordered-data.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ void btrfs_start_ordered_extent(struct inode *inode, 
				struct btrfs_ordered_extent *entry, int wait);

int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len);

struct btrfs_ordered_extent *

btrfs_lookup_first_ordered_extent(struct inode * inode, u64 file_offset);

btrfs_lookup_first_ordered_extent(struct btrfs_inode *inode, u64 file_offset);

struct btrfs_ordered_extent *btrfs_lookup_ordered_range(

		struct btrfs_inode *inode,

		u64 file_offset,