bcachefs: darray: provide typedefs for primitive types

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

diff --git a/fs/bcachefs/darray.h b/fs/bcachefs/darray.h
index c6151495985fd79cf14671a17b0a2acd1c11f114..88f0ca3f0af51a8d67fdf58259c4b3d16d772230 100644 (file)
--- a/fs/bcachefs/darray.h
+++ b/fs/bcachefs/darray.h
@@ -20,7 +20,17 @@ struct {                                                             \
 #define DARRAY(_type) DARRAY_PREALLOCATED(_type, 0)
 
 typedef DARRAY(char)   darray_char;
-typedef DARRAY(char *) darray_str;
+typedef DARRAY(char *) darray_str;
+
+typedef DARRAY(u8)     darray_u8;
+typedef DARRAY(u16)    darray_u16;
+typedef DARRAY(u32)    darray_u32;
+typedef DARRAY(u64)    darray_u64;
+
+typedef DARRAY(s8)     darray_s8;
+typedef DARRAY(s16)    darray_s16;
+typedef DARRAY(s32)    darray_s32;
+typedef DARRAY(s64)    darray_s64;
 
 int __bch2_darray_resize_noprof(darray_char *, size_t, size_t, gfp_t);
 

diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
index aaf18708527644691e0c9279704a06dbb0d6115d..d927fdafd43ac6545f1d02edba55cbec162e1495 100644 (file)
--- a/fs/bcachefs/fsck.c
+++ b/fs/bcachefs/fsck.c
@@ -2445,8 +2445,6 @@ int bch2_check_root(struct bch_fs *c)
        return ret;
 }
 
-typedef DARRAY(u32) darray_u32;
-
 static bool darray_u32_has(darray_u32 *d, u32 v)
 {
        darray_for_each(*d, i)

diff --git a/fs/bcachefs/journal_types.h b/fs/bcachefs/journal_types.h
index 8e0eba776b9d8b239b0c0a4e94546dc97d654ce7..51104bbb99dae70dda5a96aefb2984fd3128d5ae 100644 (file)
--- a/fs/bcachefs/journal_types.h
+++ b/fs/bcachefs/journal_types.h
@@ -151,8 +151,6 @@ enum journal_flags {
 #undef x
 };
 
-typedef DARRAY(u64)            darray_u64;
-
 struct journal_bio {
        struct bch_dev          *ca;
        unsigned                buf_idx;