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

btrfs-progs: convert: Avoid allocating metadata extent crossing stripe boundary 

As convert implement its own alloc extent, avoid such metadata problem
too.

Reported-by: Chris Murphy <lists@colorremedies.com>
Reported-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Qu Wenruo 2015-07-23 17:18:10 +08:00 committed by David Sterba
parent 854437ca3c
commit c11eeecd78
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
btrfs-convert.c
View File

@ -207,7 +207,8 @@ static int cache_free_extents(struct btrfs_root *root, ext2_filsys ext2_fs)
}
static int custom_alloc_extent(struct btrfs_root *root, u64 num_bytes,
u64 hint_byte, struct btrfs_key *ins)
u64 hint_byte, struct btrfs_key *ins,
int metadata)
{
u64 start;
u64 end;
@ -246,6 +247,14 @@ static int custom_alloc_extent(struct btrfs_root *root, u64 num_bytes,
continue;
}
if (metadata) {
BUG_ON(num_bytes != root->nodesize);
if (check_crossing_stripes(start, num_bytes)) {
last = round_down(start + num_bytes,
BTRFS_STRIPE_LEN);
continue;
}
}
clear_extent_dirty(&root->fs_info->free_space_cache,
start, start + num_bytes - 1, 0);
@ -1280,7 +1289,7 @@ static int create_ext2_image(struct btrfs_root *root, ext2_filsys ext2_fs,
* special, we can't rely on relocate_extents_range to relocate it.
*/
for (last_byte = 0; last_byte < first_free; last_byte += sectorsize) {
ret = custom_alloc_extent(root, sectorsize, 0, &key);
ret = custom_alloc_extent(root, sectorsize, 0, &key, 0);
if (ret)
goto fail;
ret = copy_disk_extent(root, key.objectid, last_byte,
@ -1938,7 +1947,7 @@ static int relocate_one_reference(struct btrfs_trans_handle *trans,
ret = get_state_private(reloc_tree, bytenr, &new_pos);
BUG_ON(ret);
} else {
ret = custom_alloc_extent(root, sectorsize, 0, &key);
ret = custom_alloc_extent(root, sectorsize, 0, &key, 0);
if (ret)
goto fail;
new_pos = key.objectid;

2
ctree.h
View File

@ -946,7 +946,7 @@ struct btrfs_block_group_cache {
struct btrfs_extent_ops {
int (*alloc_extent)(struct btrfs_root *root, u64 num_bytes,
u64 hint_byte, struct btrfs_key *ins);
u64 hint_byte, struct btrfs_key *ins, int metadata);
int (*free_extent)(struct btrfs_root *root, u64 bytenr,
u64 num_bytes);
};

2
extent-tree.c
View File

@ -2654,7 +2654,7 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans,
if (info->extent_ops) {
struct btrfs_extent_ops *ops = info->extent_ops;
ret = ops->alloc_extent(root, num_bytes, hint_byte, ins);
ret = ops->alloc_extent(root, num_bytes, hint_byte, ins, !data);
BUG_ON(ret);
goto found;
}