Btrfs-progs: fix a bug of converting sparse ext2/3/4
authorLiu Bo <bo.li.liu@oracle.com>
Tue, 25 Nov 2014 09:35:52 +0000 (17:35 +0800)
committerDavid Sterba <dsterba@suse.cz>
Tue, 25 Nov 2014 18:39:44 +0000 (19:39 +0100)
When converting a sparse ext* filesystem, btrfs-convert adds checksum extents
for empty extents, whose disk_bytenr = 0, and this can end up with some weird
problems, one of them is the failure of reading free space cache inode on
mounting converted btrfs.

The fix is simple, just to skip making checksum on empty extents.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
btrfs-convert.c

index a544fc6..02c5e94 100644 (file)
@@ -393,7 +393,7 @@ static int record_file_blocks(struct btrfs_trans_handle *trans,
        ret = btrfs_record_file_extent(trans, root, objectid, inode, file_pos,
                                        disk_bytenr, num_bytes);
 
-       if (ret || !checksum)
+       if (ret || !checksum || disk_bytenr == 0)
                return ret;
 
        return csum_disk_extent(trans, root, disk_bytenr, num_bytes);