Update bcachefs sources to 5a3a4087af bcachefs: Convert a BUG_ON() to a warning

[bcachefs-tools-debian] / libbcachefs / str_hash.h

diff --git a/libbcachefs/str_hash.h b/libbcachefs/str_hash.h
index fcbe42bc53c0ea1d7899f59852a31223b8f7c7d1..ef30c73a1e4b877190f0c457efb947c5b02cab95 100644 (file)
--- a/libbcachefs/str_hash.h
+++ b/libbcachefs/str_hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHEFS_STR_HASH_H
 #define _BCACHEFS_STR_HASH_H
 
@@ -41,7 +42,6 @@ bch2_hash_info_init(struct bch_fs *c,
                u8 digest[SHA256_DIGEST_SIZE];
 
                desc->tfm = c->sha256;
-               desc->flags = 0;
 
                crypto_shash_digest(desc, (void *) &bi->bi_hash_seed,
                                    sizeof(bi->bi_hash_seed), digest);
@@ -71,7 +71,7 @@ static inline void bch2_str_hash_init(struct bch_str_hash_ctx *ctx,
                ctx->crc32c = crc32c(~0, &info->crc_key, sizeof(info->crc_key));
                break;
        case BCH_STR_HASH_CRC64:
-               ctx->crc64 = bch2_crc64_update(~0, &info->crc_key, sizeof(info->crc_key));
+               ctx->crc64 = crc64_be(~0, &info->crc_key, sizeof(info->crc_key));
                break;
        case BCH_STR_HASH_SIPHASH:
                SipHash24_Init(&ctx->siphash, &info->siphash_key);
@@ -90,7 +90,7 @@ static inline void bch2_str_hash_update(struct bch_str_hash_ctx *ctx,
                ctx->crc32c = crc32c(ctx->crc32c, data, len);
                break;
        case BCH_STR_HASH_CRC64:
-               ctx->crc64 = bch2_crc64_update(ctx->crc64, data, len);
+               ctx->crc64 = crc64_be(ctx->crc64, data, len);
                break;
        case BCH_STR_HASH_SIPHASH:
                SipHash24_Update(&ctx->siphash, data, len);