From: Filipe David Borba Manana Date: Sat, 30 Nov 2013 11:28:35 +0000 (+0000) Subject: Btrfs: fix extent_map block_len after merging X-Git-Tag: v3.14-rc1~29^2~100 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d527afe1e5865d25a336f6c4157f1086cfbddc81;p=pandora-kernel.git 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: Filipe David Borba Manana Signed-off-by: Josef Bacik Signed-off-by: Chris Mason --- Reading git-diff-tree failed