Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d527afe1 authored by Filipe David Borba Manana's avatar Filipe David Borba Manana Committed by Chris Mason
Browse files

Btrfs: fix extent_map block_len after merging 



When merging an extent_map with its right neighbor, increment
its block_len with the neighbor's block_len.

Signed-off-by: default avatarFilipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 11850392

fs/btrfs/extent_map.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em) 
		merge = rb_entry(rb, struct extent_map, rb_node);

	if (rb && mergable_maps(em, merge)) {

		em->len += merge->len;

		em->block_len += merge->len;

		em->block_len += merge->block_len;

		rb_erase(&merge->rb_node, &tree->map);

		merge->in_tree = 0;

		em->mod_len = (merge->mod_start + merge->mod_len) - em->mod_start;