| Message ID | cab027dd541768375585dc32f14b160abba476c9.1716077975.git.anand.jain@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: move btrfs_block_group_root to block-group.c | expand |
在 2024/5/19 09:50, Anand Jain 写道: > The function btrfs_block_group_root() is declared in disk-io.c; however, > all its callers are in block-group.c. Move it to the latter file and > declare it static. > > Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > fs/btrfs/block-group.c | 7 +++++++ > fs/btrfs/disk-io.c | 7 ------- > fs/btrfs/disk-io.h | 1 - > 3 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c > index 1e09aeea69c2..9910bae89966 100644 > --- a/fs/btrfs/block-group.c > +++ b/fs/btrfs/block-group.c > @@ -1022,6 +1022,13 @@ static void clear_incompat_bg_bits(struct btrfs_fs_info *fs_info, u64 flags) > } > } > > +static struct btrfs_root *btrfs_block_group_root(struct btrfs_fs_info *fs_info) > +{ > + if (btrfs_fs_compat_ro(fs_info, BLOCK_GROUP_TREE)) > + return fs_info->block_group_root; > + return btrfs_extent_root(fs_info, 0); > +} > + > static int remove_block_group_item(struct btrfs_trans_handle *trans, > struct btrfs_path *path, > struct btrfs_block_group *block_group) > diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c > index e6bf895b3547..94b95836f61f 100644 > --- a/fs/btrfs/disk-io.c > +++ b/fs/btrfs/disk-io.c > @@ -846,13 +846,6 @@ struct btrfs_root *btrfs_extent_root(struct btrfs_fs_info *fs_info, u64 bytenr) > return btrfs_global_root(fs_info, &key); > } > > -struct btrfs_root *btrfs_block_group_root(struct btrfs_fs_info *fs_info) > -{ > - if (btrfs_fs_compat_ro(fs_info, BLOCK_GROUP_TREE)) > - return fs_info->block_group_root; > - return btrfs_extent_root(fs_info, 0); > -} > - > struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, > u64 objectid) > { > diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h > index 76eb53fe7a11..1f93feae1872 100644 > --- a/fs/btrfs/disk-io.h > +++ b/fs/btrfs/disk-io.h > @@ -83,7 +83,6 @@ struct btrfs_root *btrfs_global_root(struct btrfs_fs_info *fs_info, > struct btrfs_key *key); > struct btrfs_root *btrfs_csum_root(struct btrfs_fs_info *fs_info, u64 bytenr); > struct btrfs_root *btrfs_extent_root(struct btrfs_fs_info *fs_info, u64 bytenr); > -struct btrfs_root *btrfs_block_group_root(struct btrfs_fs_info *fs_info); > > void btrfs_free_fs_info(struct btrfs_fs_info *fs_info); > void btrfs_btree_balance_dirty(struct btrfs_fs_info *fs_info);
On Sun, May 19, 2024 at 08:20:41AM GMT, Anand Jain wrote: > The function btrfs_block_group_root() is declared in disk-io.c; however, > all its callers are in block-group.c. Move it to the latter file and > declare it static. > > Signed-off-by: Anand Jain <anand.jain@oracle.com> > --- Looks reasonable. Reviewed-by: Naohiro Aota <naohiro.aota@wdc.com>
diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index 1e09aeea69c2..9910bae89966 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -1022,6 +1022,13 @@ static void clear_incompat_bg_bits(struct btrfs_fs_info *fs_info, u64 flags) } } +static struct btrfs_root *btrfs_block_group_root(struct btrfs_fs_info *fs_info) +{ + if (btrfs_fs_compat_ro(fs_info, BLOCK_GROUP_TREE)) + return fs_info->block_group_root; + return btrfs_extent_root(fs_info, 0); +} + static int remove_block_group_item(struct btrfs_trans_handle *trans, struct btrfs_path *path, struct btrfs_block_group *block_group) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index e6bf895b3547..94b95836f61f 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -846,13 +846,6 @@ struct btrfs_root *btrfs_extent_root(struct btrfs_fs_info *fs_info, u64 bytenr) return btrfs_global_root(fs_info, &key); } -struct btrfs_root *btrfs_block_group_root(struct btrfs_fs_info *fs_info) -{ - if (btrfs_fs_compat_ro(fs_info, BLOCK_GROUP_TREE)) - return fs_info->block_group_root; - return btrfs_extent_root(fs_info, 0); -} - struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, u64 objectid) { diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index 76eb53fe7a11..1f93feae1872 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h @@ -83,7 +83,6 @@ struct btrfs_root *btrfs_global_root(struct btrfs_fs_info *fs_info, struct btrfs_key *key); struct btrfs_root *btrfs_csum_root(struct btrfs_fs_info *fs_info, u64 bytenr); struct btrfs_root *btrfs_extent_root(struct btrfs_fs_info *fs_info, u64 bytenr); -struct btrfs_root *btrfs_block_group_root(struct btrfs_fs_info *fs_info); void btrfs_free_fs_info(struct btrfs_fs_info *fs_info); void btrfs_btree_balance_dirty(struct btrfs_fs_info *fs_info);
The function btrfs_block_group_root() is declared in disk-io.c; however, all its callers are in block-group.c. Move it to the latter file and declare it static. Signed-off-by: Anand Jain <anand.jain@oracle.com> --- fs/btrfs/block-group.c | 7 +++++++ fs/btrfs/disk-io.c | 7 ------- fs/btrfs/disk-io.h | 1 - 3 files changed, 7 insertions(+), 8 deletions(-)