| Message ID | 20160602072250.25214-1-quwenruo@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Jun 02, 2016 at 03:22:49PM +0800, Qu Wenruo wrote: > When copying inode, if there is a file referring part of a hole range, > convert will fail. > > The problem is, when calculating real extent bytenr, it doesn't check if > the original extent is a hole. > > In case the orinal extent is a hole, we still calculate bytenr using > file_pos - found_extent_file_pos, causing non-zero value, and later > btrfs_record_file_extent() detects that we are pointing to non-exist > extent and aborts convert. > > Fix it by checking the disk_bytenr before calculating real disk bytenr. > > Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/btrfs-convert.c b/btrfs-convert.c index 5f6b44c..43b8b08 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -572,7 +572,11 @@ static int record_file_blocks(struct blk_iterate_data *data, BUG_ON(cur_off - key.offset >= extent_num_bytes); btrfs_release_path(path); - real_disk_bytenr = cur_off - key.offset + extent_disk_bytenr; + if (extent_disk_bytenr) + real_disk_bytenr = cur_off - key.offset + + extent_disk_bytenr; + else + real_disk_bytenr = 0; cur_len = min(key.offset + extent_num_bytes, old_disk_bytenr + num_bytes) - cur_off; ret = btrfs_record_file_extent(data->trans, data->root,
When copying inode, if there is a file referring part of a hole range, convert will fail. The problem is, when calculating real extent bytenr, it doesn't check if the original extent is a hole. In case the orinal extent is a hole, we still calculate bytenr using file_pos - found_extent_file_pos, causing non-zero value, and later btrfs_record_file_extent() detects that we are pointing to non-exist extent and aborts convert. Fix it by checking the disk_bytenr before calculating real disk bytenr. Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> --- These commits (especially for next testcase commits, which includes 4 80+K e2image raw dumps) can also be fetched from my github: https://github.com/adam900710/btrfs-progs.git convert_fixes --- btrfs-convert.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)