Commit 912eea7e authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by David Sterba

btrfs: pass a reloc_control to relocate_one_folio()

Pass a struct reloc_control to relocate_one_folio, instead of passing
it's members data_inode and cluster as separate arguments to the function.
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 2e9e8dcd
...@@ -2947,10 +2947,12 @@ static u64 get_cluster_boundary_end(const struct file_extent_cluster *cluster, ...@@ -2947,10 +2947,12 @@ static u64 get_cluster_boundary_end(const struct file_extent_cluster *cluster,
return cluster->boundary[cluster_nr + 1] - 1; return cluster->boundary[cluster_nr + 1] - 1;
} }
static int relocate_one_folio(struct inode *inode, struct file_ra_state *ra, static int relocate_one_folio(struct reloc_control *rc,
const struct file_extent_cluster *cluster, struct file_ra_state *ra,
int *cluster_nr, unsigned long index) int *cluster_nr, unsigned long index)
{ {
const struct file_extent_cluster *cluster = &rc->cluster;
struct inode *inode = rc->data_inode;
struct btrfs_fs_info *fs_info = inode_to_fs_info(inode); struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);
u64 offset = BTRFS_I(inode)->reloc_block_group_start; u64 offset = BTRFS_I(inode)->reloc_block_group_start;
const unsigned long last_index = (cluster->end - offset) >> PAGE_SHIFT; const unsigned long last_index = (cluster->end - offset) >> PAGE_SHIFT;
...@@ -3116,7 +3118,7 @@ static int relocate_file_extent_cluster(struct reloc_control *rc) ...@@ -3116,7 +3118,7 @@ static int relocate_file_extent_cluster(struct reloc_control *rc)
last_index = (cluster->end - offset) >> PAGE_SHIFT; last_index = (cluster->end - offset) >> PAGE_SHIFT;
for (index = (cluster->start - offset) >> PAGE_SHIFT; for (index = (cluster->start - offset) >> PAGE_SHIFT;
index <= last_index && !ret; index++) index <= last_index && !ret; index++)
ret = relocate_one_folio(inode, ra, cluster, &cluster_nr, index); ret = relocate_one_folio(rc, ra, &cluster_nr, index);
if (ret == 0) if (ret == 0)
WARN_ON(cluster_nr != cluster->nr); WARN_ON(cluster_nr != cluster->nr);
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment