Merge tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git] / fs / btrfs / check-integrity.c
index cb7f3fe9c9f6ff21bacffd3ab5a4a2bc7eccf1f0..d897ef803b3b6f3efcb0e8fc3d05bbeff994da35 100644 (file)
@@ -94,6 +94,7 @@
 #include <linux/mutex.h>
 #include <linux/genhd.h>
 #include <linux/blkdev.h>
+#include <linux/vmalloc.h>
 #include "ctree.h"
 #include "disk-io.h"
 #include "hash.h"
@@ -326,9 +327,6 @@ static int btrfsic_handle_extent_data(struct btrfsic_state *state,
 static int btrfsic_map_block(struct btrfsic_state *state, u64 bytenr, u32 len,
                             struct btrfsic_block_data_ctx *block_ctx_out,
                             int mirror_num);
-static int btrfsic_map_superblock(struct btrfsic_state *state, u64 bytenr,
-                                 u32 len, struct block_device *bdev,
-                                 struct btrfsic_block_data_ctx *block_ctx_out);
 static void btrfsic_release_block_ctx(struct btrfsic_block_data_ctx *block_ctx);
 static int btrfsic_read_block(struct btrfsic_state *state,
                              struct btrfsic_block_data_ctx *block_ctx);
@@ -1326,24 +1324,25 @@ static int btrfsic_create_link_to_next_block(
                l = NULL;
                next_block->generation = BTRFSIC_GENERATION_UNKNOWN;
        } else {
-               if (next_block->logical_bytenr != next_bytenr &&
-                   !(!next_block->is_metadata &&
-                     0 == next_block->logical_bytenr)) {
-                       printk(KERN_INFO
-                              "Referenced block @%llu (%s/%llu/%d)"
-                              " found in hash table, %c,"
-                              " bytenr mismatch (!= stored %llu).\n",
-                              next_bytenr, next_block_ctx->dev->name,
-                              next_block_ctx->dev_bytenr, *mirror_nump,
-                              btrfsic_get_block_type(state, next_block),
-                              next_block->logical_bytenr);
-               } else if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
-                       printk(KERN_INFO
-                              "Referenced block @%llu (%s/%llu/%d)"
-                              " found in hash table, %c.\n",
-                              next_bytenr, next_block_ctx->dev->name,
-                              next_block_ctx->dev_bytenr, *mirror_nump,
-                              btrfsic_get_block_type(state, next_block));
+               if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE) {
+                       if (next_block->logical_bytenr != next_bytenr &&
+                           !(!next_block->is_metadata &&
+                             0 == next_block->logical_bytenr))
+                               printk(KERN_INFO
+                                      "Referenced block @%llu (%s/%llu/%d) found in hash table, %c, bytenr mismatch (!= stored %llu).\n",
+                                      next_bytenr, next_block_ctx->dev->name,
+                                      next_block_ctx->dev_bytenr, *mirror_nump,
+                                      btrfsic_get_block_type(state,
+                                                             next_block),
+                                      next_block->logical_bytenr);
+                       else
+                               printk(KERN_INFO
+                                      "Referenced block @%llu (%s/%llu/%d) found in hash table, %c.\n",
+                                      next_bytenr, next_block_ctx->dev->name,
+                                      next_block_ctx->dev_bytenr, *mirror_nump,
+                                      btrfsic_get_block_type(state,
+                                                             next_block));
+               }
                next_block->logical_bytenr = next_bytenr;
 
                next_block->mirror_num = *mirror_nump;
@@ -1529,7 +1528,9 @@ static int btrfsic_handle_extent_data(
                                return -1;
                        }
                        if (!block_was_created) {
-                               if (next_block->logical_bytenr != next_bytenr &&
+                               if ((state->print_mask &
+                                    BTRFSIC_PRINT_MASK_VERBOSE) &&
+                                   next_block->logical_bytenr != next_bytenr &&
                                    !(!next_block->is_metadata &&
                                      0 == next_block->logical_bytenr)) {
                                        printk(KERN_INFO
@@ -1607,25 +1608,6 @@ static int btrfsic_map_block(struct btrfsic_state *state, u64 bytenr, u32 len,
        return ret;
 }
 
-static int btrfsic_map_superblock(struct btrfsic_state *state, u64 bytenr,
-                                 u32 len, struct block_device *bdev,
-                                 struct btrfsic_block_data_ctx *block_ctx_out)
-{
-       block_ctx_out->dev = btrfsic_dev_state_lookup(bdev);
-       block_ctx_out->dev_bytenr = bytenr;
-       block_ctx_out->start = bytenr;
-       block_ctx_out->len = len;
-       block_ctx_out->datav = NULL;
-       block_ctx_out->pagev = NULL;
-       block_ctx_out->mem_to_free = NULL;
-       if (NULL != block_ctx_out->dev) {
-               return 0;
-       } else {
-               printk(KERN_INFO "btrfsic: error, cannot lookup dev (#2)!\n");
-               return -ENXIO;
-       }
-}
-
 static void btrfsic_release_block_ctx(struct btrfsic_block_data_ctx *block_ctx)
 {
        if (block_ctx->mem_to_free) {
@@ -1901,25 +1883,26 @@ again:
                                                               dev_state,
                                                               dev_bytenr);
                        }
-                       if (block->logical_bytenr != bytenr &&
-                           !(!block->is_metadata &&
-                             block->logical_bytenr == 0))
-                               printk(KERN_INFO
-                                      "Written block @%llu (%s/%llu/%d)"
-                                      " found in hash table, %c,"
-                                      " bytenr mismatch"
-                                      " (!= stored %llu).\n",
-                                      bytenr, dev_state->name, dev_bytenr,
-                                      block->mirror_num,
-                                      btrfsic_get_block_type(state, block),
-                                      block->logical_bytenr);
-                       else if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
-                               printk(KERN_INFO
-                                      "Written block @%llu (%s/%llu/%d)"
-                                      " found in hash table, %c.\n",
-                                      bytenr, dev_state->name, dev_bytenr,
-                                      block->mirror_num,
-                                      btrfsic_get_block_type(state, block));
+                       if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE) {
+                               if (block->logical_bytenr != bytenr &&
+                                   !(!block->is_metadata &&
+                                     block->logical_bytenr == 0))
+                                       printk(KERN_INFO
+                                              "Written block @%llu (%s/%llu/%d) found in hash table, %c, bytenr mismatch (!= stored %llu).\n",
+                                              bytenr, dev_state->name,
+                                              dev_bytenr,
+                                              block->mirror_num,
+                                              btrfsic_get_block_type(state,
+                                                                     block),
+                                              block->logical_bytenr);
+                               else
+                                       printk(KERN_INFO
+                                              "Written block @%llu (%s/%llu/%d) found in hash table, %c.\n",
+                                              bytenr, dev_state->name,
+                                              dev_bytenr, block->mirror_num,
+                                              btrfsic_get_block_type(state,
+                                                                     block));
+                       }
                        block->logical_bytenr = bytenr;
                } else {
                        if (num_pages * PAGE_CACHE_SIZE <
@@ -2002,24 +1985,13 @@ again:
                        }
                }
 
-               if (block->is_superblock)
-                       ret = btrfsic_map_superblock(state, bytenr,
-                                                    processed_len,
-                                                    bdev, &block_ctx);
-               else
-                       ret = btrfsic_map_block(state, bytenr, processed_len,
-                                               &block_ctx, 0);
-               if (ret) {
-                       printk(KERN_INFO
-                              "btrfsic: btrfsic_map_block(root @%llu)"
-                              " failed!\n", bytenr);
-                       goto continue_loop;
-               }
-               block_ctx.datav = mapped_datav;
-               /* the following is required in case of writes to mirrors,
-                * use the same that was used for the lookup */
                block_ctx.dev = dev_state;
                block_ctx.dev_bytenr = dev_bytenr;
+               block_ctx.start = bytenr;
+               block_ctx.len = processed_len;
+               block_ctx.pagev = NULL;
+               block_ctx.mem_to_free = NULL;
+               block_ctx.datav = mapped_datav;
 
                if (is_metadata || state->include_extent_data) {
                        block->never_written = 0;
@@ -2133,10 +2105,6 @@ again:
                        /* this is getting ugly for the
                         * include_extent_data case... */
                        bytenr = 0;     /* unknown */
-                       block_ctx.start = bytenr;
-                       block_ctx.len = processed_len;
-                       block_ctx.mem_to_free = NULL;
-                       block_ctx.pagev = NULL;
                } else {
                        processed_len = state->metablock_size;
                        bytenr = btrfs_stack_header_bytenr(
@@ -2149,22 +2117,15 @@ again:
                                       "Written block @%llu (%s/%llu/?)"
                                       " !found in hash table, M.\n",
                                       bytenr, dev_state->name, dev_bytenr);
-
-                       ret = btrfsic_map_block(state, bytenr, processed_len,
-                                               &block_ctx, 0);
-                       if (ret) {
-                               printk(KERN_INFO
-                                      "btrfsic: btrfsic_map_block(root @%llu)"
-                                      " failed!\n",
-                                      dev_bytenr);
-                               goto continue_loop;
-                       }
                }
-               block_ctx.datav = mapped_datav;
-               /* the following is required in case of writes to mirrors,
-                * use the same that was used for the lookup */
+
                block_ctx.dev = dev_state;
                block_ctx.dev_bytenr = dev_bytenr;
+               block_ctx.start = bytenr;
+               block_ctx.len = processed_len;
+               block_ctx.pagev = NULL;
+               block_ctx.mem_to_free = NULL;
+               block_ctx.datav = mapped_datav;
 
                block = btrfsic_block_alloc();
                if (NULL == block) {
@@ -3130,10 +3091,13 @@ int btrfsic_mount(struct btrfs_root *root,
                       root->sectorsize, PAGE_CACHE_SIZE);
                return -1;
        }
-       state = kzalloc(sizeof(*state), GFP_NOFS);
-       if (NULL == state) {
-               printk(KERN_INFO "btrfs check-integrity: kmalloc() failed!\n");
-               return -1;
+       state = kzalloc(sizeof(*state), GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
+       if (!state) {
+               state = vzalloc(sizeof(*state));
+               if (!state) {
+                       printk(KERN_INFO "btrfs check-integrity: vzalloc() failed!\n");
+                       return -1;
+               }
        }
 
        if (!btrfsic_is_initialized) {
@@ -3277,5 +3241,8 @@ void btrfsic_unmount(struct btrfs_root *root,
 
        mutex_unlock(&btrfsic_mutex);
 
-       kfree(state);
+       if (is_vmalloc_addr(state))
+               vfree(state);
+       else
+               kfree(state);
 }