On 9/15/16 2:57 PM, Josef Bacik wrote: > btrfs/022 was spitting a warning for the case that we exceed the quota. If we > fail to make our quota reservation we need to clean up our data space > reservation. Thanks, > > Signed-off-by: Josef Bacik <jba...@fb.com> > --- > fs/btrfs/extent-tree.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c > index 03da2f6..d72eaae 100644 > --- a/fs/btrfs/extent-tree.c > +++ b/fs/btrfs/extent-tree.c > @@ -4286,13 +4286,10 @@ int btrfs_check_data_free_space(struct inode *inode, > u64 start, u64 len) > if (ret < 0) > return ret; > > - /* > - * Use new btrfs_qgroup_reserve_data to reserve precious data space > - * > - * TODO: Find a good method to avoid reserve data space for NOCOW > - * range, but don't impact performance on quota disable case. > - */ > + /* Use new btrfs_qgroup_reserve_data to reserve precious data space. */ > ret = btrfs_qgroup_reserve_data(inode, start, len); > + if (ret) > + btrfs_free_reserved_data_space_noquota(inode, start, len); > return ret; > } > >
Tested-by: Jeff Mahoney <je...@suse.com> btrfs/022 passes now. Thanks, -Jeff -- Jeff Mahoney SUSE Labs
signature.asc
Description: OpenPGP digital signature
