New upstream release

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

diff --git a/libbcachefs/io.h b/libbcachefs/io.h
index 68e4d7642d4ee38fdca2e35fc0af46c295e29b7e..1476380d5fbf498c22103a3e755941cd431ea7f1 100644 (file)
--- a/libbcachefs/io.h
+++ b/libbcachefs/io.h
@@ -15,7 +15,11 @@
 void bch2_bio_free_pages_pool(struct bch_fs *, struct bio *);
 void bch2_bio_alloc_pages_pool(struct bch_fs *, struct bio *, size_t);
 
+#ifndef CONFIG_BCACHEFS_NO_LATENCY_ACCT
 void bch2_latency_acct(struct bch_dev *, u64, int);
+#else
+static inline void bch2_latency_acct(struct bch_dev *ca, u64 submit_time, int rw) {}
+#endif
 
 void bch2_submit_wbio_replicas(struct bch_write_bio *, struct bch_fs *,
                               enum bch_data_type, const struct bkey_i *, bool);
@@ -24,27 +28,38 @@ void bch2_submit_wbio_replicas(struct bch_write_bio *, struct bch_fs *,
 
 const char *bch2_blk_status_to_str(blk_status_t);
 
+#define BCH_WRITE_FLAGS()              \
+       x(ALLOC_NOWAIT)                 \
+       x(CACHED)                       \
+       x(DATA_ENCODED)                 \
+       x(PAGES_STABLE)                 \
+       x(PAGES_OWNED)                  \
+       x(ONLY_SPECIFIED_DEVS)          \
+       x(WROTE_DATA_INLINE)            \
+       x(FROM_INTERNAL)                \
+       x(CHECK_ENOSPC)                 \
+       x(SYNC)                         \
+       x(MOVE)                         \
+       x(IN_WORKER)                    \
+       x(DONE)                         \
+       x(IO_ERROR)                     \
+       x(CONVERT_UNWRITTEN)
+
+enum __bch_write_flags {
+#define x(f)   __BCH_WRITE_##f,
+       BCH_WRITE_FLAGS()
+#undef x
+};
+
 enum bch_write_flags {
-       BCH_WRITE_ALLOC_NOWAIT          = (1 << 0),
-       BCH_WRITE_CACHED                = (1 << 1),
-       BCH_WRITE_DATA_ENCODED          = (1 << 2),
-       BCH_WRITE_PAGES_STABLE          = (1 << 3),
-       BCH_WRITE_PAGES_OWNED           = (1 << 4),
-       BCH_WRITE_ONLY_SPECIFIED_DEVS   = (1 << 5),
-       BCH_WRITE_WROTE_DATA_INLINE     = (1 << 6),
-       BCH_WRITE_CHECK_ENOSPC          = (1 << 7),
-       BCH_WRITE_SYNC                  = (1 << 8),
-       BCH_WRITE_MOVE                  = (1 << 9),
-
-       /* Internal: */
-       BCH_WRITE_DONE                  = (1 << 10),
-       BCH_WRITE_IO_ERROR              = (1 << 11),
-       BCH_WRITE_CONVERT_UNWRITTEN     = (1 << 12),
+#define x(f)   BCH_WRITE_##f = 1U << __BCH_WRITE_##f,
+       BCH_WRITE_FLAGS()
+#undef x
 };
 
 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;
 }
@@ -71,10 +86,10 @@ static inline void bch2_write_op_init(struct bch_write_op *op, struct bch_fs *c,
        op->written             = 0;
        op->error               = 0;
        op->csum_type           = bch2_data_checksum_type(c, opts);
-       op->compression_type    = bch2_compression_opt_to_type[opts.compression];
+       op->compression_opt     = 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;
@@ -98,10 +113,12 @@ 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;
 }
 
+void bch2_write_op_to_text(struct printbuf *, struct bch_write_op *);
+
 struct bch_devs_mask;
 struct cache_promote_op;
 struct extent_ptr_decoded;