summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2020-06-15 17:00:02 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2020-06-15 17:00:02 -0400
commitf8f84d93888483ee8fbac6bdea96d474a89c93e7 (patch)
tree0a80e9e8ec0d4cd8691f53cc46cf0e377ef918c1
parent1d4bb7f4d144e311c6c646c11fef7928b622a48f (diff)
Update bcachefs sources to 8a316f4112 bcachefs: Give bkey_cached_key same attributes as bpos
-rw-r--r--.bcachefs_revision2
-rw-r--r--libbcachefs/btree_types.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision
index f4b1fb4b..7354361c 100644
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-4837f82ee1a0eaa2fe7c161c940f672c9e52afb6
+8a316f4112c5aa4b3c2c4745fa83475dbec8a959
diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h
index ba47f512..ea25b04b 100644
--- a/libbcachefs/btree_types.h
+++ b/libbcachefs/btree_types.h
@@ -298,7 +298,7 @@ struct btree_key_cache {
struct bkey_cached_key {
u32 btree_id;
struct bpos pos;
-} __packed;
+} __attribute__((packed, aligned(4)));
#define BKEY_CACHED_DIRTY 0