Update bcachefs sources to 25de2b00dc bcachefs: Change check for invalid key types

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

diff --git a/libbcachefs/io_types.h b/libbcachefs/io_types.h
index ff18fdc90eb7822c7d5765e84d47fd9b3fa6f416..0fbdfbf90ad836282eab3d55761c0f6aa0b2e821 100644 (file)
--- a/libbcachefs/io_types.h
+++ b/libbcachefs/io_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHEFS_IO_TYPES_H
 #define _BCACHEFS_IO_TYPES_H
 
@@ -14,6 +15,8 @@
 
 struct bch_read_bio {
        struct bch_fs           *c;
+       u64                     start_time;
+       u64                     submit_time;
 
        /*
         * Reads will often have to be split, and if the extent being read from
@@ -35,24 +38,39 @@ struct bch_read_bio {
         */
        struct bvec_iter        bvec_iter;
 
-       unsigned                submit_time_us;
-       u8                      flags;
+       unsigned                offset_into_extent;
+
+       u16                     flags;
        union {
        struct {
-       u8                      bounce:1,
+       u16                     bounce:1,
                                split:1,
+                               kmalloc:1,
+                               have_ioref:1,
                                narrow_crcs:1,
+                               hole:1,
                                retry:2,
                                context:2;
        };
-       u8                      _state;
+       u16                     _state;
        };
 
        struct bch_devs_list    devs_have;
 
-       struct extent_pick_ptr  pick;
-       /* start pos of data we read (may not be pos of data we want) */
-       struct bpos             pos;
+       struct extent_ptr_decoded pick;
+
+       /*
+        * pos we read from - different from data_pos for indirect extents:
+        */
+       u32                     subvol;
+       struct bpos             read_pos;
+
+       /*
+        * start pos of data we read (may not be pos of data we want) - for
+        * promote, narrow extents paths:
+        */
+       enum btree_id           data_btree;
+       struct bpos             data_pos;
        struct bversion         version;
 
        struct promote_op       *promote;
@@ -65,24 +83,24 @@ struct bch_read_bio {
 };
 
 struct bch_write_bio {
+       struct_group(wbio,
        struct bch_fs           *c;
-       struct bch_dev          *ca;
-       union {
        struct bch_write_bio    *parent;
-       struct closure          *cl;
-       };
+
+       u64                     submit_time;
+       u64                     inode_offset;
 
        struct bch_devs_list    failed;
-       u8                      order;
+       u8                      dev;
 
        unsigned                split:1,
                                bounce:1,
                                put_bio:1,
-                               have_io_ref:1,
-                               used_mempool:1;
-
-       unsigned                submit_time_us;
-       void                    *data;
+                               have_ioref:1,
+                               nocow:1,
+                               used_mempool:1,
+                               first_btree_write:1;
+       );
 
        struct bio              bio;
 };
@@ -90,52 +108,56 @@ struct bch_write_bio {
 struct bch_write_op {
        struct closure          cl;
        struct bch_fs           *c;
-       struct workqueue_struct *io_wq;
+       void                    (*end_io)(struct bch_write_op *);
+       u64                     start_time;
 
        unsigned                written; /* sectors */
        u16                     flags;
-       s8                      error;
+       s16                     error; /* dio write path expects it to hold -ERESTARTSYS... */
 
        unsigned                csum_type:4;
        unsigned                compression_type:4;
        unsigned                nr_replicas:4;
        unsigned                nr_replicas_required:4;
-       unsigned                alloc_reserve:4;
+       unsigned                watermark:3;
+       unsigned                incompressible:1;
+       unsigned                stripe_waited:1;
 
-       u8                      open_buckets_nr;
        struct bch_devs_list    devs_have;
        u16                     target;
        u16                     nonce;
+       struct bch_io_opts      opts;
 
+       u32                     subvol;
        struct bpos             pos;
        struct bversion         version;
 
        /* For BCH_WRITE_DATA_ENCODED: */
        struct bch_extent_crc_unpacked crc;
 
-       struct bch_devs_mask    *devs;
        struct write_point_specifier write_point;
 
+       struct write_point      *wp;
+       struct list_head        wp_list;
+
        struct disk_reservation res;
 
-       u8                      open_buckets[16];
+       struct open_buckets     open_buckets;
 
-       /*
-        * If caller wants to flush but hasn't passed us a journal_seq ptr, we
-        * still need to stash the journal_seq somewhere:
-        */
-       union {
-               u64                     *journal_seq_p;
-               u64                     journal_seq;
-       };
-
-       int                     (*index_update_fn)(struct bch_write_op *);
+       u64                     new_i_size;
+       s64                     i_sectors_delta;
 
        struct bch_devs_mask    failed;
 
        struct keylist          insert_keys;
        u64                     inline_keys[BKEY_EXTENT_U64s_MAX * 2];
 
+       /*
+        * Bitmask of devices that have had nocow writes issued to them since
+        * last flush:
+        */
+       struct bch_devs_mask    *devs_need_flush;
+
        /* Must be last: */
        struct bch_write_bio    wbio;
 };