btrfs: do not subtract delalloc from avail bytes

commit d89c285d28491d8f10534c262ac9e6bdcbe1b4d2 upstream.

The block group's avail bytes printed when dumping a space info subtract
the delalloc_bytes. However, as shown in btrfs_add_reserved_bytes() and
btrfs_free_reserved_bytes(), it is added or subtracted along with
"reserved" for the delalloc case, which means the "delalloc_bytes" is a
part of the "reserved" bytes. So, excluding it to calculate the avail space
counts delalloc_bytes twice, which can lead to an invalid result.

Fixes: e50b122b832b ("btrfs: print available space for a block group when dumping a space info")
CC: stable@vger.kernel.org # 6.6+
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: Boris Burkov <boris@bur.io>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index c141a8aca930a75854efb6cd262fdd339aec945d..8f194eefd3f3839fd8f4174d957a90217d293cbc 100644 (file)
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -573,8 +573,7 @@ again:
 
                spin_lock(&cache->lock);
                avail = cache->length - cache->used - cache->pinned -
-                       cache->reserved - cache->delalloc_bytes -
-                       cache->bytes_super - cache->zone_unusable;
+                       cache->reserved - cache->bytes_super - cache->zone_unusable;
                btrfs_info(fs_info,
 "block group %llu has %llu bytes, %llu used %llu pinned %llu reserved %llu delalloc %llu super %llu zone_unusable (%llu bytes available) %s",
                           cache->start, cache->length, cache->used, cache->pinned,