Re: [PATCH 32/36] btrfs: clear delayed_refs_rsv for dirty bg cleanup

2018-09-18 Thread Omar Sandoval
On Tue, Sep 11, 2018 at 01:58:03PM -0400, Josef Bacik wrote:
> We keep track of dirty bg's as a reservation in the delayed_refs_rsv, so
> when we abort and we cleanup those dirty bgs we need to drop their
> reservation so we don't have accounting issues and lots of scary
> messages on umount.

Shouldn't this just be part of patch 6?

> Signed-off-by: Josef Bacik 
> ---
>  fs/btrfs/disk-io.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index caaca8154a1a..54fbdc944a3f 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -4412,6 +4412,7 @@ void btrfs_cleanup_dirty_bgs(struct btrfs_transaction 
> *cur_trans,
>  
>   spin_unlock(&cur_trans->dirty_bgs_lock);
>   btrfs_put_block_group(cache);
> + btrfs_delayed_refs_rsv_release(fs_info, 1);
>   spin_lock(&cur_trans->dirty_bgs_lock);
>   }
>   spin_unlock(&cur_trans->dirty_bgs_lock);
> -- 
> 2.14.3
> 


[PATCH 32/36] btrfs: clear delayed_refs_rsv for dirty bg cleanup

2018-09-11 Thread Josef Bacik
We keep track of dirty bg's as a reservation in the delayed_refs_rsv, so
when we abort and we cleanup those dirty bgs we need to drop their
reservation so we don't have accounting issues and lots of scary
messages on umount.

Signed-off-by: Josef Bacik 
---
 fs/btrfs/disk-io.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index caaca8154a1a..54fbdc944a3f 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4412,6 +4412,7 @@ void btrfs_cleanup_dirty_bgs(struct btrfs_transaction 
*cur_trans,
 
spin_unlock(&cur_trans->dirty_bgs_lock);
btrfs_put_block_group(cache);
+   btrfs_delayed_refs_rsv_release(fs_info, 1);
spin_lock(&cur_trans->dirty_bgs_lock);
}
spin_unlock(&cur_trans->dirty_bgs_lock);
-- 
2.14.3