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

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

diff --git a/libbcachefs/io.h b/libbcachefs/io.h
index 90948bb0aabd62b8be5e69ce7d2add70f0d56ec1..7a243a5f3f89e9c47ef2f420065cddb62a95ec34 100644 (file)
--- a/libbcachefs/io.h
+++ b/libbcachefs/io.h
@@ -59,7 +59,7 @@ enum bch_write_flags {
 
 static inline struct workqueue_struct *index_update_wq(struct bch_write_op *op)
 {
-       return op->alloc_reserve == RESERVE_movinggc
+       return op->watermark == BCH_WATERMARK_copygc
                ? op->c->copygc_wq
                : op->c->btree_update_wq;
 }
@@ -89,7 +89,7 @@ static inline void bch2_write_op_init(struct bch_write_op *op, struct bch_fs *c,
        op->compression_type    = bch2_compression_opt_to_type[opts.compression];
        op->nr_replicas         = 0;
        op->nr_replicas_required = c->opts.data_replicas_required;
-       op->alloc_reserve       = RESERVE_none;
+       op->watermark           = BCH_WATERMARK_normal;
        op->incompressible      = 0;
        op->open_buckets.nr     = 0;
        op->devs_have.nr        = 0;
@@ -113,7 +113,7 @@ static inline struct bch_write_bio *wbio_init(struct bio *bio)
 {
        struct bch_write_bio *wbio = to_wbio(bio);
 
-       memset(wbio, 0, offsetof(struct bch_write_bio, bio));
+       memset(&wbio->wbio, 0, sizeof(wbio->wbio));
        return wbio;
 }