Commit 00925dd4 authored by Naohiro Aota's avatar Naohiro Aota Committed by ZhangPeng
Browse files

btrfs: do not subtract delalloc from avail bytes 

stable inclusion
from stable-v6.6.45
commit 0caf15bee7b1362f02e19145d71b7fcdda1836ec
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJEIR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0caf15bee7b1362f02e19145d71b7fcdda1836ec



--------------------------------

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: e50b122b ("btrfs: print available space for a block group when dumping a space info")
CC: stable@vger.kernel.org # 6.6+
Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: default avatarBoris Burkov <boris@bur.io>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent dd6c9c16

fs/btrfs/space-info.c

+1 −2
Original line number Diff line number Diff line
@@ -524,8 +524,7 @@ void btrfs_dump_space_info(struct btrfs_fs_info *fs_info, 


		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,