Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

btrfs: Make btrfs_get_logged_extents take btrfs_inode 



Signed-off-by: default avatarNikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent a0308dd7

fs/btrfs/ordered-data.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -432,7 +432,7 @@ int btrfs_dec_test_ordered_pending(struct inode *inode, 
}

}





/* Needs to either be called under a log transaction or the log_mutex */

/* Needs to either be called under a log transaction or the log_mutex */

void btrfs_get_logged_extents(struct inode *inode,

void btrfs_get_logged_extents(struct btrfs_inode *inode,

			      struct list_head *logged_list,

			      struct list_head *logged_list,

			      const loff_t start,

			      const loff_t start,

			      const loff_t end)

			      const loff_t end)
@@ -442,7 +442,7 @@ void btrfs_get_logged_extents(struct inode *inode, 
	struct rb_node *n;

	struct rb_node *n;

	struct rb_node *prev;

	struct rb_node *prev;





	tree = &BTRFS_I(inode)->ordered_tree;

	tree = &inode->ordered_tree;

	spin_lock_irq(&tree->lock);

	spin_lock_irq(&tree->lock);

	n = __tree_search(&tree->tree, end, &prev);

	n = __tree_search(&tree->tree, end, &prev);

	if (!n)

	if (!n)

fs/btrfs/ordered-data.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -201,7 +201,7 @@ int btrfs_wait_ordered_extents(struct btrfs_root *root, int nr, 
			       const u64 range_start, const u64 range_len);

			       const u64 range_start, const u64 range_len);

int btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr,

int btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr,

			      const u64 range_start, const u64 range_len);

			      const u64 range_start, const u64 range_len);

void btrfs_get_logged_extents(struct inode *inode,

void btrfs_get_logged_extents(struct btrfs_inode *inode,

			      struct list_head *logged_list,

			      struct list_head *logged_list,

			      const loff_t start,

			      const loff_t start,

			      const loff_t end);

			      const loff_t end);

fs/btrfs/tree-log.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4193,7 +4193,7 @@ static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans, 
	}

	}





	list_sort(NULL, &extents, extent_cmp);

	list_sort(NULL, &extents, extent_cmp);

	btrfs_get_logged_extents(inode, logged_list, start, end);

	btrfs_get_logged_extents(BTRFS_I(inode), logged_list, start, end);

	/*

	/*

	 * Some ordered extents started by fsync might have completed

	 * Some ordered extents started by fsync might have completed

	 * before we could collect them into the list logged_list, which

	 * before we could collect them into the list logged_list, which