btrfs-progs: mark static & remove unused from non-kernel code

[platform/upstream/btrfs-progs.git] / btrfs-map-logical.c

diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c
index fa4fb3f..ee8407f 100644 (file)
--- a/btrfs-map-logical.c
+++ b/btrfs-map-logical.c
@@ -37,8 +37,8 @@
  * */
 static FILE *info_file;
 
-struct extent_buffer *debug_read_block(struct btrfs_root *root, u64 bytenr,
-                                    u32 blocksize, int copy)
+static struct extent_buffer * debug_read_block(struct btrfs_root *root,
+               u64 bytenr, u32 blocksize, int copy)
 {
        int ret;
        struct extent_buffer *eb;
@@ -55,8 +55,16 @@ struct extent_buffer *debug_read_block(struct btrfs_root *root, u64 bytenr,
        length = blocksize;
        while (1) {
                ret = btrfs_map_block(&root->fs_info->mapping_tree, READ,
-                                     eb->start, &length, &multi, mirror_num);
-               BUG_ON(ret);
+                                     eb->start, &length, &multi,
+                                     mirror_num, NULL);
+               if (ret) {
+                       fprintf(info_file,
+                               "Error: fails to map mirror%d logical %llu: %s\n",
+                               mirror_num, (unsigned long long)eb->start,
+                               strerror(-ret));
+                       free_extent_buffer(eb);
+                       return NULL;
+               }
                device = multi->stripes[0].dev;
                eb->fd = device->fd;
                device->total_ios++;
@@ -68,7 +76,7 @@ struct extent_buffer *debug_read_block(struct btrfs_root *root, u64 bytenr,
                kfree(multi);
 
                if (!copy || mirror_num == copy)
-                       ret = read_extent_from_disk(eb);
+                       ret = read_extent_from_disk(eb, 0, eb->len);
 
                num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
                                              eb->start, eb->len);
@@ -114,7 +122,6 @@ int main(int ac, char **av)
        int copy = 0;
        u64 bytes = 0;
        int out_fd = 0;
-       int err;
 
        while(1) {
                int c;
@@ -182,8 +189,9 @@ int main(int ac, char **av)
                        out_fd = open(output_file, O_RDWR | O_CREAT, 0600);
                        if (out_fd < 0)
                                goto close;
-                       err = ftruncate(out_fd, 0);
-                       if (err) {
+                       ret = ftruncate(out_fd, 0);
+                       if (ret) {
+                               ret = 1;
                                close(out_fd);
                                goto close;
                        }
@@ -200,8 +208,9 @@ int main(int ac, char **av)
        while (bytes > 0) {
                eb = debug_read_block(root, logical, root->sectorsize, copy);
                if (eb && output_file) {
-                       err = write(out_fd, eb->data, eb->len);
-                       if (err < 0 || err != eb->len) {
+                       ret = write(out_fd, eb->data, eb->len);
+                       if (ret < 0 || ret != eb->len) {
+                               ret = 1;
                                fprintf(stderr, "output file write failed\n");
                                goto out_close_fd;
                        }