mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
btrfs: delete chunk allocation attemp when setting block group ro
Below test will fail currently: mkfs.ext4 -F /dev/sda btrfs-convert /dev/sda mount /dev/sda /mnt btrfs device add -f /dev/sdb /mnt btrfs balance start -v -dconvert=raid1 -mconvert=raid1 /mnt The reason is there are some block groups with usage 0, but the whole disk hasn't free space to allocate new chunk, so we even can't set such block group readonly. This patch deletes the chunk allocation when setting block group ro. For META, we already have reserve. But for SYSTEM, we don't have, so the check_system_chunk is still required. Signed-off-by: Shaohua Li <shli@fb.com> Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
parent
289454ad26
commit
2f0810880f
1 changed files with 5 additions and 8 deletions
|
@ -8482,14 +8482,6 @@ int btrfs_set_block_group_ro(struct btrfs_root *root,
|
||||||
if (IS_ERR(trans))
|
if (IS_ERR(trans))
|
||||||
return PTR_ERR(trans);
|
return PTR_ERR(trans);
|
||||||
|
|
||||||
alloc_flags = update_block_group_flags(root, cache->flags);
|
|
||||||
if (alloc_flags != cache->flags) {
|
|
||||||
ret = do_chunk_alloc(trans, root, alloc_flags,
|
|
||||||
CHUNK_ALLOC_FORCE);
|
|
||||||
if (ret < 0)
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = set_block_group_ro(cache, 0);
|
ret = set_block_group_ro(cache, 0);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -8500,6 +8492,11 @@ int btrfs_set_block_group_ro(struct btrfs_root *root,
|
||||||
goto out;
|
goto out;
|
||||||
ret = set_block_group_ro(cache, 0);
|
ret = set_block_group_ro(cache, 0);
|
||||||
out:
|
out:
|
||||||
|
if (cache->flags & BTRFS_BLOCK_GROUP_SYSTEM) {
|
||||||
|
alloc_flags = update_block_group_flags(root, cache->flags);
|
||||||
|
check_system_chunk(trans, root, alloc_flags);
|
||||||
|
}
|
||||||
|
|
||||||
btrfs_end_transaction(trans, root);
|
btrfs_end_transaction(trans, root);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue