Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
e06af207
Commit
e06af207
authored
Dec 15, 2023
by
Kent Overstreet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bcachefs: fix userspace build errors
Signed-off-by:
Kent Overstreet
<
kent.overstreet@linux.dev
>
parent
73ffa530
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
fs/bcachefs/bcachefs.h
fs/bcachefs/bcachefs.h
+1
-0
fs/bcachefs/bcachefs_format.h
fs/bcachefs/bcachefs_format.h
+1
-1
fs/bcachefs/btree_iter.c
fs/bcachefs/btree_iter.c
+2
-2
No files found.
fs/bcachefs/bcachefs.h
View file @
e06af207
...
@@ -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>
...
...
fs/bcachefs/bcachefs_format.h
View file @
e06af207
...
@@ -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:
...
...
fs/bcachefs/btree_iter.c
View file @
e06af207
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment