[PATCH] Btrfs: make sure to update total_bitmaps when freeing cache

[PATCH] Btrfs: make sure to update total_bitmaps when freeing cache

[Josef Bacik]

A user reported this bug again where we have more bitmaps than we are supposed
to.  This is because we failed to load the free space cache, but don't update
the ctl->total_bitmaps counter when we remove entries from the tree.  This patch
fixes this problem and we should be good to go again.  Thanks,

Signed-off-by: Josef Bacik <josef@redhat.com>
---
 fs/btrfs/free-space-cache.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index 3c1a047..aa62448 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -1844,6 +1844,8 @@ void __btrfs_remove_free_space_cache_locked(struct btrfs_free_space_ctl *ctl)
 		info = rb_entry(node, struct btrfs_free_space, offset_index);
 		unlink_free_space(ctl, info);
 		kfree(info->bitmap);
+		ctl->total_bitmaps--;
+		ctl->op->recalc_thresholds(ctl);
 		kmem_cache_free(btrfs_free_space_cachep, info);
 		if (need_resched()) {
 			spin_unlock(&ctl->tree_lock);
-- 
1.7.2.3

Re: [PATCH] Btrfs: make sure to update total_bitmaps when freeing cache

[Josef Bacik]

On Thu, Jun 23, 2011 at 03:51:37PM -0400, Josef Bacik wrote:
> A user reported this bug again where we have more bitmaps than we are supposed
> to.  This is because we failed to load the free space cache, but don't update
> the ctl->total_bitmaps counter when we remove entries from the tree.  This patch
> fixes this problem and we should be good to go again.  Thanks,
> 
> Signed-off-by: Josef Bacik <josef@redhat.com>
> ---
>  fs/btrfs/free-space-cache.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
> index 3c1a047..aa62448 100644
> --- a/fs/btrfs/free-space-cache.c
> +++ b/fs/btrfs/free-space-cache.c
> @@ -1844,6 +1844,8 @@ void __btrfs_remove_free_space_cache_locked(struct btrfs_free_space_ctl *ctl)
>  		info = rb_entry(node, struct btrfs_free_space, offset_index);
>  		unlink_free_space(ctl, info);
>  		kfree(info->bitmap);
> +		ctl->total_bitmaps--;
> +		ctl->op->recalc_thresholds(ctl);
>  		kmem_cache_free(btrfs_free_space_cachep, info);
>  		if (need_resched()) {
>  			spin_unlock(&ctl->tree_lock);
> -- 
> 1.7.2.3
> 

IGNORE THIS ONE.  Sorry, this is what haste gets you.

Josef