diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-05 23:09:25 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-06 01:07:16 -0500 |
| commit | f3f005c76eb5636542a8f5b137bd1904d57e8f86 (patch) | |
| tree | ecada3604cb1668411386264ed92d0e61536a93a /c_src | |
| parent | 1ef396b684a419b5a50ab215103486d189068800 (diff) | |
Update bcachefs sources to 50847e296b34 bcachefs: Check subvol <-> inode pointers in check_inode()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'c_src')
| -rw-r--r-- | c_src/cmd_format.c | 3 | ||||
| -rw-r--r-- | c_src/cmd_fs.c | 3 | ||||
| -rw-r--r-- | c_src/tools-util.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/c_src/cmd_format.c b/c_src/cmd_format.c index 6b77763e..3d29f413 100644 --- a/c_src/cmd_format.c +++ b/c_src/cmd_format.c @@ -23,12 +23,13 @@ #include "cmds.h" #include "libbcachefs.h" #include "crypto.h" -#include "libbcachefs/darray.h" #include "libbcachefs/errcode.h" #include "libbcachefs/opts.h" #include "libbcachefs/super-io.h" #include "libbcachefs/util.h" +#include "linux/darray.h" + #define OPTS \ x(0, replicas, required_argument) \ x(0, encrypted, no_argument) \ diff --git a/c_src/cmd_fs.c b/c_src/cmd_fs.c index 1a5d144b..d8542d61 100644 --- a/c_src/cmd_fs.c +++ b/c_src/cmd_fs.c @@ -9,13 +9,14 @@ #include "libbcachefs/bcachefs_ioctl.h" #include "libbcachefs/buckets.h" -#include "libbcachefs/darray.h" #include "libbcachefs/opts.h" #include "libbcachefs/super-io.h" #include "cmds.h" #include "libbcachefs.h" +#include "linux/darray.h" + static void __dev_usage_type_to_text(struct printbuf *out, enum bch_data_type type, unsigned bucket_size, diff --git a/c_src/tools-util.h b/c_src/tools-util.h index bff3bc65..4682406e 100644 --- a/c_src/tools-util.h +++ b/c_src/tools-util.h @@ -20,7 +20,7 @@ #include <linux/uuid.h> #include "libbcachefs/bcachefs.h" #include "libbcachefs/bbpos.h" -#include "libbcachefs/darray.h" +#include "linux/darray.h" #define noreturn __attribute__((noreturn)) |