diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2017-10-05 14:41:44 -0800 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2017-10-08 10:25:33 -0800 |
| commit | 85ee972555948337bb1a58f0702a4da95db6758f (patch) | |
| tree | 34f13bce6d9ad221593a45d3ee3b489b777cba04 /libbcachefs/bset.h | |
| parent | e7c2bb91bce30a987c8c4e2875f2c63e887d3aa5 (diff) | |
Update bcachefs sources to e82e656279 bcachefs: Cleanups for building in userspace
Diffstat (limited to 'libbcachefs/bset.h')
| -rw-r--r-- | libbcachefs/bset.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libbcachefs/bset.h b/libbcachefs/bset.h index 660a7283..a1337bf8 100644 --- a/libbcachefs/bset.h +++ b/libbcachefs/bset.h @@ -1,5 +1,5 @@ -#ifndef _BCACHE_BSET_H -#define _BCACHE_BSET_H +#ifndef _BCACHEFS_BSET_H +#define _BCACHEFS_BSET_H #include <linux/kernel.h> #include <linux/types.h> @@ -183,7 +183,7 @@ bkey_unpack_key_format_checked(const struct btree *b, { struct bkey dst; -#ifdef HAVE_BCACHE_COMPILED_UNPACK +#ifdef HAVE_BCACHEFS_COMPILED_UNPACK { compiled_unpack_fn unpack_fn = b->aux_data; unpack_fn(&dst, src); @@ -221,7 +221,7 @@ static inline struct bpos bkey_unpack_pos_format_checked(const struct btree *b, const struct bkey_packed *src) { -#ifdef HAVE_BCACHE_COMPILED_UNPACK +#ifdef HAVE_BCACHEFS_COMPILED_UNPACK return bkey_unpack_key_format_checked(b, src).p; #else return __bkey_unpack_pos(&b->format, src); @@ -618,4 +618,4 @@ static inline void bch2_verify_btree_nr_keys(struct btree *b) __bch2_verify_btree_nr_keys(b); } -#endif +#endif /* _BCACHEFS_BSET_H */ |