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 <jo...@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
