diff options
| author | Qu Wenruo <quwenruo@cn.fujitsu.com> | 2016-12-19 14:56:37 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-12-21 16:29:06 +0100 |
| commit | 95ecaf0d61ae0bd5f70d6ddf79de3a36a24f816d (patch) | |
| tree | c642263f9dd0bc841f361db9d1f5e1e6e4c82f42 /file-item.c | |
| parent | e0485281ed319d99bdae13acdd5c9aed014083d9 (diff) | |
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>
Diffstat (limited to 'file-item.c')
| -rw-r--r-- | file-item.c | 11 |
1 files changed, 11 insertions, 0 deletions
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; |