Update bcachefs sources to 04f2d2ae5b bcachefs: Fix build error on weird gcc

[bcachefs-tools-debian] / libbcachefs / io_types.h

diff --git a/libbcachefs/io_types.h b/libbcachefs/io_types.h
index 3b2ed0fa583a05b50fb92ad9adff7f37a10d7ce0..0fbdfbf90ad836282eab3d55761c0f6aa0b2e821 100644 (file)
--- a/libbcachefs/io_types.h
+++ b/libbcachefs/io_types.h
@@ -83,6 +83,7 @@ struct bch_read_bio {
 };
 
 struct bch_write_bio {
+       struct_group(wbio,
        struct bch_fs           *c;
        struct bch_write_bio    *parent;
 
@@ -99,6 +100,7 @@ struct bch_write_bio {
                                nocow:1,
                                used_mempool:1,
                                first_btree_write:1;
+       );
 
        struct bio              bio;
 };
@@ -117,7 +119,7 @@ struct bch_write_op {
        unsigned                compression_type:4;
        unsigned                nr_replicas:4;
        unsigned                nr_replicas_required:4;
-       unsigned                alloc_reserve:3;
+       unsigned                watermark:3;
        unsigned                incompressible:1;
        unsigned                stripe_waited:1;