diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-30 12:38:54 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-30 12:51:13 -0500 |
| commit | 0c7db4eca3e6519043c10288cb41f8a0ee634a0b (patch) | |
| tree | fd788cd46ea5b14e287b48677a94384a5abcce27 /libbcachefs/btree_cache.h | |
| parent | bca8b084ad754afc54e628d9db7721b90d9480b7 (diff) | |
Update bcachefs sources to 62de7539dc bcachefs: Make bkey types globally unique
Diffstat (limited to 'libbcachefs/btree_cache.h')
| -rw-r--r-- | libbcachefs/btree_cache.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/btree_cache.h b/libbcachefs/btree_cache.h index 399f8b9a..08e6f2a6 100644 --- a/libbcachefs/btree_cache.h +++ b/libbcachefs/btree_cache.h @@ -3,7 +3,6 @@ #include "bcachefs.h" #include "btree_types.h" -#include "extents.h" struct btree_iter; @@ -36,12 +35,13 @@ void bch2_fs_btree_cache_exit(struct bch_fs *); int bch2_fs_btree_cache_init(struct bch_fs *); void bch2_fs_btree_cache_init_early(struct btree_cache *); -#define PTR_HASH(_k) (bkey_i_to_extent_c(_k)->v._data[0]) +#define PTR_HASH(_k) *((u64 *) &bkey_i_to_btree_ptr_c(_k)->v) /* is btree node in hash table? */ static inline bool btree_node_hashed(struct btree *b) { - return bkey_extent_is_data(&b->key.k) && PTR_HASH(&b->key); + return b->key.k.type == KEY_TYPE_btree_ptr && + PTR_HASH(&b->key); } #define for_each_cached_btree(_b, _c, _tbl, _iter, _pos) \ |