Btrfs: fix extent_map block_len after merging
authorFilipe David Borba Manana <fdmanana@gmail.com>
Sat, 30 Nov 2013 11:28:35 +0000 (11:28 +0000)
committerChris Mason <clm@fb.com>
Tue, 28 Jan 2014 21:19:51 +0000 (13:19 -0800)
When merging an extent_map with its right neighbor, increment
its block_len with the neighbor's block_len.

Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/extent_map.c

Simple merge