diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-04-04 22:15:36 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-04-04 22:25:40 -0400 |
| commit | d13bbb2955f899f10be4ab315ad229d2951fdcda (patch) | |
| tree | d84a27d61361ac6b884c8c6decabfbaed02a7be0 /libbcachefs/checksum.h | |
| parent | be02db130bf75c28e402d890f4d994f3608707ff (diff) | |
Update bcachefs sources to d83b992f65 bcachefs: Rewrite journal_seq_blacklist machinery
Diffstat (limited to 'libbcachefs/checksum.h')
| -rw-r--r-- | libbcachefs/checksum.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/checksum.h b/libbcachefs/checksum.h index fb72c6a..580eff6 100644 --- a/libbcachefs/checksum.h +++ b/libbcachefs/checksum.h @@ -6,7 +6,7 @@ #include "super-io.h" #include <linux/crc64.h> -#include <crypto/chacha20.h> +#include <crypto/chacha.h> static inline u64 bch2_crc64_update(u64 crc, const void *p, size_t len) { @@ -126,9 +126,9 @@ static inline bool bch2_crc_cmp(struct bch_csum l, struct bch_csum r) /* for skipping ahead and encrypting/decrypting at an offset: */ static inline struct nonce nonce_add(struct nonce nonce, unsigned offset) { - EBUG_ON(offset & (CHACHA20_BLOCK_SIZE - 1)); + EBUG_ON(offset & (CHACHA_BLOCK_SIZE - 1)); - le32_add_cpu(&nonce.d[0], offset / CHACHA20_BLOCK_SIZE); + le32_add_cpu(&nonce.d[0], offset / CHACHA_BLOCK_SIZE); return nonce; } |