bcachefs: fix userspace build errors

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h
index db246d00c607a30b825bcdf241663f3b8be3fd4b..f6b621412ee43cba0a365b3c91e11466cde3308e 100644 (file)
--- a/fs/bcachefs/bcachefs.h
+++ b/fs/bcachefs/bcachefs.h
@@ -193,6 +193,7 @@
 #include <linux/mutex.h>
 #include <linux/percpu-refcount.h>
 #include <linux/percpu-rwsem.h>
+#include <linux/refcount.h>
 #include <linux/rhashtable.h>
 #include <linux/rwsem.h>
 #include <linux/semaphore.h>

diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h
index 3d9393eecb93e4e938bbc1c3423a54eb67c01582..c134da7d8194007533b31730282c7b180e9f5613 100644 (file)
--- a/fs/bcachefs/bcachefs_format.h
+++ b/fs/bcachefs/bcachefs_format.h
@@ -2249,7 +2249,7 @@ static inline unsigned jset_entry_dev_usage_nr_types(struct jset_entry_dev_usage
 struct jset_entry_log {
        struct jset_entry       entry;
        u8                      d[];
-} __packed;
+} __packed __aligned(8);
 
 /*
  * On disk format for a journal entry:

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 9946b9b6b5a57ff5dfd155bccc66de66b28a0dd6..ed4b8c302a9a033b9fbb1fd20b85fc959e921a6a 100644 (file)
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -2699,8 +2699,8 @@ void bch2_trans_copy_iter(struct btree_iter *dst, struct btree_iter *src)
 void *__bch2_trans_kmalloc(struct btree_trans *trans, size_t size)
 {
        unsigned new_top = trans->mem_top + size;
-       size_t old_bytes = trans->mem_bytes;
-       size_t new_bytes = roundup_pow_of_two(new_top);
+       unsigned old_bytes = trans->mem_bytes;
+       unsigned new_bytes = roundup_pow_of_two(new_top);
        int ret;
        void *new_mem;
        void *p;