CHROMIUM: verity: pull up maybe_read_entry

include/linux/dm-bht.h

 /*
  * 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 GPLv2.
  */
 #ifndef __LINUX_DM_BHT_H
 #define __LINUX_DM_BHT_H
 
 #include <linux/compiler.h>
 #include <linux/crypto.h>
 #include <linux/mempool.h>
 #include <linux/types.h>
 
 /* To avoid allocating memory for digest tests, we just setup a
  * max to use for now.
  */
 #define DM_BHT_MAX_DIGEST_SIZE 128  /* 1k hashes are unlikely for now */
 
 /* UNALLOCATED, PENDING, READY, and VERIFIED are valid states. All other
  * values are entry-related return codes.
  */
 #define DM_BHT_ENTRY_VERIFIED 8  /* 'nodes' has been checked against parent */
 #define DM_BHT_ENTRY_READY 4  /* 'nodes' is loaded and available */
 #define DM_BHT_ENTRY_PENDING 2  /* 'nodes' is being loaded */
-#define DM_BHT_ENTRY_REQUESTED 1  /* non-state response indicating entry is
-                                   * pending because of the current call
-                                   */
 #define DM_BHT_ENTRY_UNALLOCATED 0 /* untouched */
 #define DM_BHT_ENTRY_ERROR -1 /* entry is unsuitable for use */
 #define DM_BHT_ENTRY_ERROR_IO -2 /* I/O error on load */
 
 /* Additional possible return codes */
 #define DM_BHT_ENTRY_ERROR_MISMATCH -3 /* Digest mismatch */
 
 /* dm_bht_entry
  * Contains dm_bht->node_count tree nodes at a given tree depth.
  * state is used to transactionally assure that data is paged in
@@ skipping 93 matching lines @@
  */
 int dm_bht_compute(struct dm_bht *bht, void *read_cb_ctx);
 int dm_bht_sync(struct dm_bht *bht, void *write_cb_ctx);
 int dm_bht_store_block(struct dm_bht *bht, unsigned int block_index,
                        u8 *block_data);
 int dm_bht_zeroread_callback(void *ctx, sector_t start, u8 *dst, sector_t count,
                              struct dm_bht_entry *entry);
 void dm_bht_read_completed(struct dm_bht_entry *entry, int status);
 void dm_bht_write_completed(struct dm_bht_entry *entry, int status);
 #endif  /* __LINUX_DM_BHT_H */