| Message ID | 20190619174724.1675-6-josef@toxicpanda.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: move the block_rsv code out of extent-tree.c | expand |
On 19.06.19 г. 20:47 ч., Josef Bacik wrote: > block_rsv_release_bytes() is the internal to the block_rsv code, and > shouldn't be called directly by anything else. Switch all users to the > exported helpers. > > Signed-off-by: Josef Bacik <josef@toxicpanda.com> > --- > fs/btrfs/extent-tree.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c > index 6995edf887e1..d1fce37107b4 100644 > --- a/fs/btrfs/extent-tree.c > +++ b/fs/btrfs/extent-tree.c > @@ -4750,12 +4750,11 @@ static void btrfs_inode_rsv_release(struct btrfs_inode *inode, bool qgroup_free) > void btrfs_delayed_refs_rsv_release(struct btrfs_fs_info *fs_info, int nr) > { > struct btrfs_block_rsv *block_rsv = &fs_info->delayed_refs_rsv; > - struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv; > u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, nr); > u64 released = 0; > > - released = block_rsv_release_bytes(fs_info, block_rsv, global_rsv, > - num_bytes, NULL); > + released = __btrfs_block_rsv_release(fs_info, block_rsv, num_bytes, > + NULL); You should use btrfs_block_rsv_release when qgroup_to_release is NULL. <snip>
On Thu, Jun 20, 2019 at 11:32:21AM +0300, Nikolay Borisov wrote: > > > On 19.06.19 г. 20:47 ч., Josef Bacik wrote: > > block_rsv_release_bytes() is the internal to the block_rsv code, and > > shouldn't be called directly by anything else. Switch all users to the > > exported helpers. > > > > Signed-off-by: Josef Bacik <josef@toxicpanda.com> > > --- > > fs/btrfs/extent-tree.c | 14 ++++++-------- > > 1 file changed, 6 insertions(+), 8 deletions(-) > > > > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c > > index 6995edf887e1..d1fce37107b4 100644 > > --- a/fs/btrfs/extent-tree.c > > +++ b/fs/btrfs/extent-tree.c > > @@ -4750,12 +4750,11 @@ static void btrfs_inode_rsv_release(struct btrfs_inode *inode, bool qgroup_free) > > void btrfs_delayed_refs_rsv_release(struct btrfs_fs_info *fs_info, int nr) > > { > > struct btrfs_block_rsv *block_rsv = &fs_info->delayed_refs_rsv; > > - struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv; > > u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, nr); > > u64 released = 0; > > > > - released = block_rsv_release_bytes(fs_info, block_rsv, global_rsv, > > - num_bytes, NULL); > > + released = __btrfs_block_rsv_release(fs_info, block_rsv, num_bytes, > > + NULL); > > You should use btrfs_block_rsv_release when qgroup_to_release is NULL. > btrfs_block_rsv_release() is a void, __btrfs_block_rsv_release returns how much was free'd. This could be cleaned up later, but I'm purposefully trying to not change code and just move things around. Thanks, Josef
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 6995edf887e1..d1fce37107b4 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -4750,12 +4750,11 @@ static void btrfs_inode_rsv_release(struct btrfs_inode *inode, bool qgroup_free) void btrfs_delayed_refs_rsv_release(struct btrfs_fs_info *fs_info, int nr) { struct btrfs_block_rsv *block_rsv = &fs_info->delayed_refs_rsv; - struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv; u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, nr); u64 released = 0; - released = block_rsv_release_bytes(fs_info, block_rsv, global_rsv, - num_bytes, NULL); + released = __btrfs_block_rsv_release(fs_info, block_rsv, num_bytes, + NULL); if (released) trace_btrfs_space_reservation(fs_info, "delayed_refs_rsv", 0, released, 0); @@ -4840,8 +4839,7 @@ static void init_global_block_rsv(struct btrfs_fs_info *fs_info) static void release_global_block_rsv(struct btrfs_fs_info *fs_info) { - block_rsv_release_bytes(fs_info, &fs_info->global_block_rsv, NULL, - (u64)-1, NULL); + btrfs_block_rsv_release(fs_info, &fs_info->global_block_rsv, (u64)-1); WARN_ON(fs_info->trans_block_rsv.size > 0); WARN_ON(fs_info->trans_block_rsv.reserved > 0); WARN_ON(fs_info->chunk_block_rsv.size > 0); @@ -4890,8 +4888,8 @@ void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans) WARN_ON_ONCE(!list_empty(&trans->new_bgs)); - block_rsv_release_bytes(fs_info, &fs_info->chunk_block_rsv, NULL, - trans->chunk_bytes_reserved, NULL); + btrfs_block_rsv_release(fs_info, &fs_info->chunk_block_rsv, + trans->chunk_bytes_reserved); trans->chunk_bytes_reserved = 0; } @@ -7441,7 +7439,7 @@ static void unuse_block_rsv(struct btrfs_fs_info *fs_info, struct btrfs_block_rsv *block_rsv, u32 blocksize) { btrfs_block_rsv_add_bytes(block_rsv, blocksize, false); - block_rsv_release_bytes(fs_info, block_rsv, NULL, 0, NULL); + btrfs_block_rsv_release(fs_info, block_rsv, 0); } /*
block_rsv_release_bytes() is the internal to the block_rsv code, and shouldn't be called directly by anything else. Switch all users to the exported helpers. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- fs/btrfs/extent-tree.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)