Commit 72e1b3f1 authored by Luis de Bethencourt's avatar Luis de Bethencourt Committed by Khalid Elmously

btrfs: fix mixed block count of available space

BugLink: https://bugs.launchpad.net/bugs/1864774

[ Upstream commit ae02d1bd ]

Metadata for mixed block is already accounted in total data and should not
be counted as part of the free metadata space.
Signed-off-by: default avatarLuis de Bethencourt <luisbg@osg.samsung.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=114281Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent b657ffa2
...@@ -1978,6 +1978,7 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf) ...@@ -1978,6 +1978,7 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
struct btrfs_block_rsv *block_rsv = &fs_info->global_block_rsv; struct btrfs_block_rsv *block_rsv = &fs_info->global_block_rsv;
int ret; int ret;
u64 thresh = 0; u64 thresh = 0;
int mixed = 0;
/* /*
* holding chunk_muext to avoid allocating new chunks, holding * holding chunk_muext to avoid allocating new chunks, holding
...@@ -2003,8 +2004,17 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf) ...@@ -2003,8 +2004,17 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
} }
} }
} }
if (found->flags & BTRFS_BLOCK_GROUP_METADATA)
total_free_meta += found->disk_total - found->disk_used; /*
* Metadata in mixed block goup profiles are accounted in data
*/
if (!mixed && found->flags & BTRFS_BLOCK_GROUP_METADATA) {
if (found->flags & BTRFS_BLOCK_GROUP_DATA)
mixed = 1;
else
total_free_meta += found->disk_total -
found->disk_used;
}
total_used += found->disk_used; total_used += found->disk_used;
} }
...@@ -2042,7 +2052,7 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf) ...@@ -2042,7 +2052,7 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
*/ */
thresh = 4 * 1024 * 1024; thresh = 4 * 1024 * 1024;
if (total_free_meta - thresh < block_rsv->size) if (!mixed && total_free_meta - thresh < block_rsv->size)
buf->f_bavail = 0; buf->f_bavail = 0;
buf->f_type = BTRFS_SUPER_MAGIC; buf->f_type = BTRFS_SUPER_MAGIC;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment