Update bcachefs sources to 1569db10e2 bcachefs: Use KEY_TYPE_deleted whitouts for...

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

diff --git a/libbcachefs/journal_types.h b/libbcachefs/journal_types.h
index a91662f6a61badc865336adf7bad48b665fd76ae..8eea12a03c06e424918e592c85ee02c5b8769a75 100644 (file)
--- a/libbcachefs/journal_types.h
+++ b/libbcachefs/journal_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHEFS_JOURNAL_TYPES_H
 #define _BCACHEFS_JOURNAL_TYPES_H
 
@@ -21,8 +22,10 @@ struct journal_buf {
 
        struct closure_waitlist wait;
 
-       unsigned                size;
-       unsigned                disk_sectors;
+       unsigned                buf_size;       /* size in bytes of @data */
+       unsigned                sectors;        /* maximum size for current entry */
+       unsigned                disk_sectors;   /* maximum size entry could have been, if
+                                                  buf_size was bigger */
        unsigned                u64s_reserved;
        /* bloom filter: */
        unsigned long           has_inode[1024 / sizeof(unsigned long)];
@@ -51,24 +54,6 @@ struct journal_entry_pin {
        u64                             seq;
 };
 
-/* corresponds to a btree node with a blacklisted bset: */
-struct blacklisted_node {
-       __le64                  seq;
-       enum btree_id           btree_id;
-       struct bpos             pos;
-};
-
-struct journal_seq_blacklist {
-       struct list_head        list;
-       u64                     start;
-       u64                     end;
-
-       struct journal_entry_pin pin;
-
-       struct blacklisted_node *entries;
-       size_t                  nr_entries;
-};
-
 struct journal_res {
        bool                    ref;
        u8                      idx;
@@ -77,6 +62,14 @@ struct journal_res {
        u64                     seq;
 };
 
+/*
+ * For reserving space in the journal prior to getting a reservation on a
+ * particular journal entry:
+ */
+struct journal_preres {
+       unsigned                u64s;
+};
+
 union journal_res_state {
        struct {
                atomic64_t      counter;
@@ -95,6 +88,21 @@ union journal_res_state {
        };
 };
 
+union journal_preres_state {
+       struct {
+               atomic64_t      counter;
+       };
+
+       struct {
+               u64             v;
+       };
+
+       struct {
+               u32             reserved;
+               u32             remaining;
+       };
+};
+
 /* bytes: */
 #define JOURNAL_ENTRY_SIZE_MIN         (64U << 10) /* 64k */
 #define JOURNAL_ENTRY_SIZE_MAX         (4U  << 20) /* 4M */
@@ -119,6 +127,7 @@ enum {
        JOURNAL_STARTED,
        JOURNAL_NEED_WRITE,
        JOURNAL_NOT_EMPTY,
+       JOURNAL_MAY_GET_UNRESERVED,
 };
 
 /* Embedded in struct bch_fs */
@@ -128,9 +137,22 @@ struct journal {
        unsigned long           flags;
 
        union journal_res_state reservations;
+
+       /* Max size of current journal entry */
        unsigned                cur_entry_u64s;
-       unsigned                prev_buf_sectors;
-       unsigned                cur_buf_sectors;
+       unsigned                cur_entry_sectors;
+
+       /*
+        * 0, or -ENOSPC if waiting on journal reclaim, or -EROFS if
+        * insufficient devices:
+        */
+       int                     cur_entry_error;
+
+       union journal_preres_state prereserved;
+
+       /* Reserved space in journal entry to be used just prior to write */
+       unsigned                entry_u64s_reserved;
+
        unsigned                buf_size_want;
 
        /*
@@ -141,9 +163,13 @@ struct journal {
 
        spinlock_t              lock;
 
+       /* if nonzero, we may not open a new journal entry: */
+       unsigned                blocked;
+
        /* Used when waiting because the journal was full */
        wait_queue_head_t       wait;
        struct closure_waitlist async_wait;
+       struct closure_waitlist preres_wait;
 
        struct closure          io;
        struct delayed_work     write_work;
@@ -155,9 +181,6 @@ struct journal {
        u64                     seq_ondisk;
        u64                     last_seq_ondisk;
 
-       /* Reserved space in journal entry to be used just prior to write */
-       unsigned                entry_u64s_reserved;
-
        /*
         * FIFO of journal entries whose btree updates have not yet been
         * written out.
@@ -179,23 +202,22 @@ struct journal {
                struct journal_entry_pin_list *data;
        }                       pin;
 
-       struct journal_entry_pin *flush_in_progress;
-       wait_queue_head_t       pin_flush_wait;
-
        u64                     replay_journal_seq;
-
-       struct mutex            blacklist_lock;
-       struct list_head        seq_blacklist;
-       struct journal_seq_blacklist *new_blacklist;
+       u64                     replay_journal_seq_end;
 
        struct write_point      wp;
        spinlock_t              err_lock;
 
        struct delayed_work     reclaim_work;
+       struct mutex            reclaim_lock;
        unsigned long           last_flushed;
+       struct journal_entry_pin *flush_in_progress;
+       wait_queue_head_t       pin_flush_wait;
+
+       /* protects advancing ja->discard_idx: */
+       struct mutex            discard_lock;
+       bool                    can_discard;
 
-       /* protects advancing ja->last_idx: */
-       struct mutex            reclaim_lock;
        unsigned                write_delay_ms;
        unsigned                reclaim_delay_ms;
 
@@ -226,17 +248,15 @@ struct journal_device {
 
        unsigned                sectors_free;
 
-       /* Journal bucket we're currently writing to */
-       unsigned                cur_idx;
-
-       /* Last journal bucket that still contains an open journal entry */
-
        /*
-        * j->lock and j->reclaim_lock must both be held to modify, j->lock
-        * sufficient to read:
+        * discard_idx <= dirty_idx_ondisk <= dirty_idx <= cur_idx:
         */
-       unsigned                last_idx;
+       unsigned                discard_idx;            /* Next bucket to discard */
+       unsigned                dirty_idx_ondisk;
+       unsigned                dirty_idx;
+       unsigned                cur_idx;                /* Journal bucket we're currently writing to */
        unsigned                nr;
+
        u64                     *buckets;
 
        /* Bio for journal reads/writes to this device */