verity: bring back in sync with the kernel

dm-bht.c

  /*
  * Copyright (C) 2010 The Chromium OS Authors <chromium-os-dev@chromium.org>
  *
  * Device-Mapper block hash tree interface.
  * See Documentation/device-mapper/dm-bht.txt for details.
  *
  * This file is released under the GPL.
  */
 
 #include <asm/atomic.h>
@@ skipping 1095 matching lines @@
         /* TODO(wad) do we really need this? */
         if (digest_len != bht->digest_size) {
                 DMERR("invalid digest_len passed to verify_block");
                 return -EINVAL;
         }
 
         /* Make sure that the root has been verified */
         if (atomic_read(&bht->root_state) != DM_BHT_ENTRY_VERIFIED) {
                 unverified = dm_bht_verify_root(bht, dm_bht_compare_hash);
                 if (unverified) {
-                        DMCRIT("Failed to verify root: %d", unverified);
+                        DMERR_LIMIT("Failed to verify root: %d", unverified);
                         return unverified;
                 }
         }
 
         /* Now check that the digest supplied matches the leaf hash */
         unverified = dm_bht_check_block(bht, block_index, digest, &entry_state);
         if (unverified) {
-                DMCRIT("Block check failed for %u: %d", block_index,
-                       unverified);
+                DMERR_LIMIT("Block check failed for %u: %d", block_index,
+                                unverified);
                 return unverified;
         }
 
         /* If the entry which contains the block hash is marked verified, then
          * it means that its hash has been check with the parent.  In addition,
          * since that is only possible via verify_path, it transitively means
          * it is verified to the root of the tree. If the depth is 1, then it
          * means the entry was verified during root verification.
          */
         if (entry_state == DM_BHT_ENTRY_VERIFIED || bht->depth == 1)
                 return unverified;
 
         /* Now check levels in between */
         unverified = dm_bht_verify_path(bht,
                                         block_index,
                                         dm_bht_compare_hash);
         if (unverified)
-                DMERR("Failed to verify intermediary nodes for block: %u (%d)",
+                DMERR_LIMIT("Failed to verify intermediary nodes for block: %u (%d)",
                       block_index, unverified);
         return unverified;
 }
 EXPORT_SYMBOL(dm_bht_verify_block);
 
 /**
  * dm_bht_destroy - cleans up all memory used by @bht
  * @bht:        pointer to a dm_bht_create()d bht
  *
  * Returns 0 on success. Does not free @bht itself.
@@ skipping 148 matching lines @@
                 DMERR("no root digest exists to export");
                 if (available > 0)
                         *hexdigest = 0;
                 return -1;
         }
         dm_bht_bin_to_hex(bht->root_digest, hexdigest, bht->digest_size);
         return 0;
 }
 EXPORT_SYMBOL(dm_bht_root_hexdigest);