summaryrefslogtreecommitdiff
path: root/fs/bcachefs/bcachefs.h
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-06-30 16:35:37 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2022-10-14 04:59:38 -0400
commit29f20baecf850c6381a48ceb57dcefac8e15bd5b (patch)
tree0436e075bd8499e67ae70887e3b7b1ee6f823394 /fs/bcachefs/bcachefs.h
parentd91a7b6ebca99e6140c913038614f153bc4d4610 (diff)
bcachefs: Fixes for 4.19bcachefs-v4.19-backport-2.0
Diffstat (limited to 'fs/bcachefs/bcachefs.h')
-rw-r--r--fs/bcachefs/bcachefs.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h
index ccac2a3fcdf7..38f5753107c6 100644
--- a/fs/bcachefs/bcachefs.h
+++ b/fs/bcachefs/bcachefs.h
@@ -204,6 +204,7 @@
#include <linux/zstd.h>
#include "bcachefs_format.h"
+#include "darray.h"
#include "errcode.h"
#include "fifo.h"
#include "opts.h"
@@ -211,6 +212,7 @@
#define dynamic_fault(...) 0
#define race_fault(...) 0
+#define fallthrough do {} while (0) /* fallthrough */
#define trace_and_count(_c, _name, ...) \
do { \
@@ -827,7 +829,7 @@ struct bch_fs {
ZSTD_parameters zstd_params;
struct crypto_shash *sha256;
- struct crypto_sync_skcipher *chacha20;
+ struct crypto_skcipher *chacha20;
struct crypto_shash *poly1305;
atomic64_t key_version;