Btrfs: do not offset physical if we're compressed (b76bb701) · Commits · 戴 / test

xfstest btrfs/276 was freaking out on slower boxes partly because fiemap was offsetting the physical based on the extent offset. This is perfectly fine with uncompressed extents, however the extent offset is into the uncompressed area, not the compressed. So we can return a physical value that isn't at all within the area we have allocated on disk. Fix this by returning the start of the extent if it is compressed no matter what the offset. Thanks, Signed-off-by:

Josef Bacik <jbacik@fusionio.com> Signed-off-by:

Chris Mason <chris.mason@fusionio.com>

fs/btrfs/extent_io.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -4048,7 +4048,7 @@ int extent_fiemap(struct inode inode, struct fiemap_extent_info fieinfo,
		}

		while (!end) {
		u64 offset_in_extent;
		u64 offset_in_extent = 0;

		/* break if the extent we found is outside the range */
		if (em->start >= max \|\| extent_map_end(em) < off)
		@@ -4064,8 +4064,11 @@ int extent_fiemap(struct inode inode, struct fiemap_extent_info fieinfo,

		/*
		* record the offset from the start of the extent
		* for adjusting the disk offset below
		* for adjusting the disk offset below. Only do this if the
		* extent isn't compressed since our in ram offset may be past
		* what we have actually allocated on disk.
		*/
		if (!test_bit(EXTENT_FLAG_COMPRESSED, &em->flags))
		offset_in_extent = em_start - em->start;
		em_end = extent_map_end(em);
		em_len = em_end - em_start;

Admin message