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

btrfs: switch btrfs_remove_ordered_extent to btrfs_inode 



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 633cc816

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -2753,7 +2753,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 
	 * This needs to be done to make sure anybody waiting knows we are done

	 * updating everything for this ordered extent.

	 */

	btrfs_remove_ordered_extent(inode, ordered_extent);

	btrfs_remove_ordered_extent(BTRFS_I(inode), ordered_extent);



	/* once for us */

	btrfs_put_ordered_extent(ordered_extent);
@@ -8689,7 +8689,7 @@ void btrfs_destroy_inode(struct inode *vfs_inode) 
			btrfs_err(root->fs_info,

				  "found ordered extent %llu %llu on inode cleanup",

				  ordered->file_offset, ordered->num_bytes);

			btrfs_remove_ordered_extent(vfs_inode, ordered);

			btrfs_remove_ordered_extent(inode, ordered);

			btrfs_put_ordered_extent(ordered);

			btrfs_put_ordered_extent(ordered);

		}

fs/btrfs/ordered-data.c

+3 −4
Original line number Diff line number Diff line
@@ -463,13 +463,12 @@ void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry) 
 * remove an ordered extent from the tree.  No references are dropped

 * and waiters are woken up.

 */

void btrfs_remove_ordered_extent(struct inode *inode,

void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,

				 struct btrfs_ordered_extent *entry)

{

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

	struct btrfs_ordered_inode_tree *tree;

	struct btrfs_inode *btrfs_inode = BTRFS_I(inode);

	struct btrfs_root *root = btrfs_inode->root;

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct rb_node *node;

	bool pending;
@@ -527,7 +526,7 @@ void btrfs_remove_ordered_extent(struct inode *inode, 
	list_del_init(&entry->root_extent_list);

	root->nr_ordered_extents--;



	trace_btrfs_ordered_extent_remove(BTRFS_I(inode), entry);

	trace_btrfs_ordered_extent_remove(btrfs_inode, entry);



	if (!root->nr_ordered_extents) {

		spin_lock(&fs_info->ordered_root_lock);

fs/btrfs/ordered-data.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ btrfs_ordered_inode_tree_init(struct btrfs_ordered_inode_tree *t) 
}



void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry);

void btrfs_remove_ordered_extent(struct inode *inode,

void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,

				struct btrfs_ordered_extent *entry);

int btrfs_dec_test_ordered_pending(struct btrfs_inode *inode,

				   struct btrfs_ordered_extent **cached,