Commit e06af207 authored by Kent Overstreet's avatar Kent Overstreet

bcachefs: fix userspace build errors

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 73ffa530
...@@ -193,6 +193,7 @@ ...@@ -193,6 +193,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/percpu-refcount.h> #include <linux/percpu-refcount.h>
#include <linux/percpu-rwsem.h> #include <linux/percpu-rwsem.h>
#include <linux/refcount.h>
#include <linux/rhashtable.h> #include <linux/rhashtable.h>
#include <linux/rwsem.h> #include <linux/rwsem.h>
#include <linux/semaphore.h> #include <linux/semaphore.h>
......
...@@ -2249,7 +2249,7 @@ static inline unsigned jset_entry_dev_usage_nr_types(struct jset_entry_dev_usage ...@@ -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_log {
struct jset_entry entry; struct jset_entry entry;
u8 d[]; u8 d[];
} __packed; } __packed __aligned(8);
/* /*
* On disk format for a journal entry: * On disk format for a journal entry:
......
...@@ -2699,8 +2699,8 @@ void bch2_trans_copy_iter(struct btree_iter *dst, struct btree_iter *src) ...@@ -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) void *__bch2_trans_kmalloc(struct btree_trans *trans, size_t size)
{ {
unsigned new_top = trans->mem_top + size; unsigned new_top = trans->mem_top + size;
size_t old_bytes = trans->mem_bytes; unsigned old_bytes = trans->mem_bytes;
size_t new_bytes = roundup_pow_of_two(new_top); unsigned new_bytes = roundup_pow_of_two(new_top);
int ret; int ret;
void *new_mem; void *new_mem;
void *p; void *p;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment