btrfs: handle invalid range and start in merge_extent_mapping()

Turn a BUG_ON to a properly handled error and update the error message
in the caller.  It is expected that @em_in and @start passed to
btrfs_add_extent_mapping() overlap. Besides tests, the only caller
btrfs_get_extent() makes sure this is true.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 1bf4d0319f6cbec1cc74ff20bbca298255880c09..ea08601988debbdc9ce104775652a0cd42c5171c 100644 (file)
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -538,7 +538,8 @@ static noinline int merge_extent_mapping(struct extent_map_tree *em_tree,
        u64 end;
        u64 start_diff;
 
-       BUG_ON(map_start < em->start || map_start >= extent_map_end(em));
+       if (map_start < em->start || map_start >= extent_map_end(em))
+               return -EINVAL;
 
        if (existing->start > map_start) {
                next = existing;
@@ -633,9 +634,9 @@ int btrfs_add_extent_mapping(struct btrfs_fs_info *fs_info,
                                free_extent_map(em);
                                *em_in = NULL;
                                WARN_ONCE(ret,
-"unexpected error %d: merge existing(start %llu len %llu) with em(start %llu len %llu)\n",
-                                         ret, existing->start, existing->len,
-                                         orig_start, orig_len);
+"extent map merge error existing [%llu, %llu) with em [%llu, %llu) start %llu\n",
+                                         existing->start, existing->len,
+                                         orig_start, orig_len, start);
                        }
                        free_extent_map(existing);
                }