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

btrfs-progs: file-item: Fix wrong file extents inserted 

If we specify NO_HOLES incompat feature when converting, the result
image still uses hole file extents.
And further more, the hole is incorrect as its disk_num_bytes is not
zero.

The problem is at btrfs_insert_file_extent() which doesn't check if we
are going to insert hole file extent.

Modify it to skip hole file extents to allow it follow restrict NO_HOLES
flag.

And since no_holes flag can be triggered on half-way, so current fsck
won't report such error, as it consider it as old file holes.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Qu Wenruo 2016-12-19 14:56:37 +08:00 committed by David Sterba
parent e0485281ed
commit 95ecaf0d61
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
convert/main.c
View File

@ -336,7 +336,7 @@ static int record_file_blocks(struct blk_iterate_data *data,
key.offset > cur_off);
fi = btrfs_item_ptr(node, slot, struct btrfs_file_extent_item);
extent_disk_bytenr = btrfs_file_extent_disk_bytenr(node, fi);
extent_num_bytes = btrfs_file_extent_disk_num_bytes(node, fi);
extent_num_bytes = btrfs_file_extent_num_bytes(node, fi);
BUG_ON(cur_off - key.offset >= extent_num_bytes);
btrfs_release_path(&path);

11
file-item.c
View File

@ -36,11 +36,22 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
u64 disk_num_bytes, u64 num_bytes)
{
int ret = 0;
int is_hole = 0;
struct btrfs_file_extent_item *item;
struct btrfs_key file_key;
struct btrfs_path *path;
struct extent_buffer *leaf;
if (offset == 0)
is_hole = 1;
/* For NO_HOLES, we don't insert hole file extent */
if (btrfs_fs_incompat(root->fs_info, NO_HOLES) && is_hole)
return 0;
/* For hole, its disk_bytenr and disk_num_bytes must be 0 */
if (is_hole)
disk_num_bytes = 0;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;