RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: fix wrong chunk profile for do_chunk_alloc() 

[BUG]
There is a bug report that using DUP data profile, with a 400MiB source
dir, on a 7G disk leads to mkfs failure caused by ENOSPC.

[CAUSE]
After some debugging, it turns out that do_chunk_alloc() is always
passing SINGLE profile for new chunks.

The offending code looks like: extent-tree.c:: do_chunk_alloc()

	ret = btrfs_alloc_chunk(trans, fs_info, &start, &num_bytes,
	                        space_info->flags);

However since commit bce7dbba28 ("Btrfs-progs: only build space info's
for the main flags"), we no longer store the profile bits in space_info
anymore.

This makes space_info never get updated properly, and causing us to
creating more and more chunks to eat up most of the disk with unused
SINGLE chunks, and finally leads to ENOSPC.

[FIX]
Fix the bug by passing the proper flags to btrfs_alloc_chunk().
Also, to address the original problem commit 2689259501 ("btrfs progs:
fix extra metadata chunk allocation in --mixed case") tries to fix, here
we do extra bit OR to ensure we get the proper flags.

Issue: #258
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Qu Wenruo 2020-06-16 14:32:29 +08:00 committed by David Sterba
parent 94dbcc2958
commit 0ae7840775
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extent-tree.c
View File

@ -1718,8 +1718,14 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans,
return 0;
trans->allocating_chunk = 1;
ret = btrfs_alloc_chunk(trans, fs_info, &start, &num_bytes,
space_info->flags);
/*
* The space_info only has block group type (data/meta/sys), doesn't
* have the proper profile.
* While we still want to handle mixed block groups properly.
* So here add the extra bits for mixed profile.
*/
flags |= space_info->flags;
ret = btrfs_alloc_chunk(trans, fs_info, &start, &num_bytes, flags);
if (ret == -ENOSPC) {
space_info->full = 1;
trans->allocating_chunk = 0;
@ -1728,8 +1734,8 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans,
BUG_ON(ret);
ret = btrfs_make_block_group(trans, fs_info, 0, space_info->flags,
start, num_bytes);
ret = btrfs_make_block_group(trans, fs_info, 0, flags, start,
num_bytes);
BUG_ON(ret);
trans->allocating_chunk = 0;
return 0;