From 95ecaf0d61ae0bd5f70d6ddf79de3a36a24f816d Mon Sep 17 00:00:00 2001 From: Qu Wenruo Date: Mon, 19 Dec 2016 14:56:37 +0800 Subject: 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 Signed-off-by: David Sterba --- file-item.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'file-item.c') diff --git a/file-item.c b/file-item.c index 67c0b4f2..e462b4bb 100644 --- a/file-item.c +++ b/file-item.c @@ -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; -- cgit v1.2.3