btrfs-progs: check read extent errors when mapping

coverity barked out a warning that btrfs-map-logical was storing but
ignoring errors from read_extent_from_disk().   So don't ignore 'em.  I
made extent reading errors fatal to match the fatal errors from mapping
mirrors above.

And while we're at it have read_extent_from_disk() return -errno pread
errors instead of -EIO or -1 (-EPERM).  The only other caller who tests
errors clobbers them with -EIO.

Signed-off-by: Zach Brown <zab@zabbo.net>
Signed-off-by: David Sterba <dsterba@suse.cz>

diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c
index 6b475fc69eab11cca3a80328099b9ab49d86bdde..47d1104d7d1dfcb7a03ef82c36537d8d3aba841d 100644 (file)
--- a/btrfs-map-logical.c
+++ b/btrfs-map-logical.c
@@ -76,8 +76,18 @@ static struct extent_buffer * debug_read_block(struct btrfs_root *root,
                        (unsigned long long)eb->dev_bytenr, device->name);
                kfree(multi);
 
-               if (!copy || mirror_num == copy)
+               if (!copy || mirror_num == copy) {
                        ret = read_extent_from_disk(eb, 0, eb->len);
+                       if (ret) {
+                               fprintf(info_file,
+                                       "Error: failed to read extent: mirror %d logical %llu: %s\n",
+                                       mirror_num, (unsigned long long)eb->start,
+                                       strerror(-ret));
+                               free_extent_buffer(eb);
+                               eb = NULL;
+                               break;
+                       }
+               }
 
                num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
                                              eb->start, eb->len);

diff --git a/extent_io.c b/extent_io.c
index de9e0ecce3942a242138f260d21bc774463f82f9..9c982f9a91eabc78eecb90334618251ca26243b5 100644 (file)
--- a/extent_io.c
+++ b/extent_io.c
@@ -666,8 +666,10 @@ int read_extent_from_disk(struct extent_buffer *eb,
 {
        int ret;
        ret = pread(eb->fd, eb->data + offset, len, eb->dev_bytenr);
-       if (ret < 0)
+       if (ret < 0) {
+               ret = -errno;
                goto out;
+       }
        if (ret != len) {
                ret = -EIO;
                goto out;