Commit 2e9e8dcd authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by David Sterba
Browse files

btrfs: pass a reloc_control to relocate_file_extent_cluster() 



Instead of passing in a reloc_control's data_inode and
file_extent_cluster members, pass in the whole reloc_control structure.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent fa4adfc7

fs/btrfs/relocation.c

+7 −7
Original line number Diff line number Diff line
@@ -3084,9 +3084,10 @@ static int relocate_one_folio(struct inode *inode, struct file_ra_state *ra, 
	return ret;

}



static int relocate_file_extent_cluster(struct inode *inode,

					const struct file_extent_cluster *cluster)

static int relocate_file_extent_cluster(struct reloc_control *rc)

{

	struct inode *inode = rc->data_inode;

	const struct file_extent_cluster *cluster = &rc->cluster;

	u64 offset = BTRFS_I(inode)->reloc_block_group_start;

	unsigned long index;

	unsigned long last_index;
@@ -3132,7 +3133,7 @@ static noinline_for_stack int relocate_data_extent(struct reloc_control *rc, 
	struct btrfs_root *root = BTRFS_I(inode)->root;



	if (cluster->nr > 0 && extent_key->objectid != cluster->end + 1) {

		ret = relocate_file_extent_cluster(inode, cluster);

		ret = relocate_file_extent_cluster(rc);

		if (ret)

			return ret;

		cluster->nr = 0;
@@ -3158,7 +3159,7 @@ static noinline_for_stack int relocate_data_extent(struct reloc_control *rc, 
		 * the cluster we need to relocate.

		 */

		root->relocation_src_root = cluster->owning_root;

		ret = relocate_file_extent_cluster(inode, cluster);

		ret = relocate_file_extent_cluster(rc);

		if (ret)

			return ret;

		cluster->nr = 0;
@@ -3177,7 +3178,7 @@ static noinline_for_stack int relocate_data_extent(struct reloc_control *rc, 
	cluster->nr++;



	if (cluster->nr >= MAX_EXTENTS) {

		ret = relocate_file_extent_cluster(inode, cluster);

		ret = relocate_file_extent_cluster(rc);

		if (ret)

			return ret;

		cluster->nr = 0;
@@ -3775,8 +3776,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) 
	}



	if (!err) {

		ret = relocate_file_extent_cluster(rc->data_inode,

						   &rc->cluster);

		ret = relocate_file_extent_cluster(rc);

		if (ret < 0)

			err = ret;

	}