Update bcachefs sources to d267e10a43b2 bcachefs: __bch2_sb_field_to_text()

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

diff --git a/libbcachefs/bkey_methods.h b/libbcachefs/bkey_methods.h
index 912adadfb4dd40a3435d7f6a82eba365a750fa67..ee82283722b759bbce174b2d902403c0024fe574 100644 (file)
--- a/libbcachefs/bkey_methods.h
+++ b/libbcachefs/bkey_methods.h
@@ -28,10 +28,8 @@ struct bkey_ops {
        void            (*swab)(struct bkey_s);
        bool            (*key_normalize)(struct bch_fs *, struct bkey_s);
        bool            (*key_merge)(struct bch_fs *, struct bkey_s, struct bkey_s_c);
-       int             (*trans_trigger)(struct btree_trans *, enum btree_id, unsigned,
-                                        struct bkey_s_c, struct bkey_i *, unsigned);
-       int             (*atomic_trigger)(struct btree_trans *, enum btree_id, unsigned,
-                                         struct bkey_s_c, struct bkey_s_c, unsigned);
+       int             (*trigger)(struct btree_trans *, enum btree_id, unsigned,
+                                  struct bkey_s_c, struct bkey_s, unsigned);
        void            (*compat)(enum btree_id id, unsigned version,
                                  unsigned big_endian, int write,
                                  struct bkey_s);
@@ -78,82 +76,86 @@ static inline bool bch2_bkey_maybe_mergable(const struct bkey *l, const struct b
 
 bool bch2_bkey_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);
 
-static inline int bch2_mark_key(struct btree_trans *trans,
-               enum btree_id btree, unsigned level,
-               struct bkey_s_c old, struct bkey_s_c new,
-               unsigned flags)
-{
-       const struct bkey_ops *ops = bch2_bkey_type_ops(old.k->type ?: new.k->type);
-
-       return ops->atomic_trigger
-               ? ops->atomic_trigger(trans, btree, level, old, new, flags)
-               : 0;
-}
-
 enum btree_update_flags {
        __BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE = __BTREE_ITER_FLAGS_END,
        __BTREE_UPDATE_NOJOURNAL,
        __BTREE_UPDATE_KEY_CACHE_RECLAIM,
 
-       __BTREE_TRIGGER_NORUN,          /* Don't run triggers at all */
-
+       __BTREE_TRIGGER_NORUN,
+       __BTREE_TRIGGER_TRANSACTIONAL,
        __BTREE_TRIGGER_INSERT,
        __BTREE_TRIGGER_OVERWRITE,
-
        __BTREE_TRIGGER_GC,
        __BTREE_TRIGGER_BUCKET_INVALIDATE,
-       __BTREE_TRIGGER_NOATOMIC,
 };
 
 #define BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE (1U << __BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE)
 #define BTREE_UPDATE_NOJOURNAL         (1U << __BTREE_UPDATE_NOJOURNAL)
 #define BTREE_UPDATE_KEY_CACHE_RECLAIM (1U << __BTREE_UPDATE_KEY_CACHE_RECLAIM)
 
+/* Don't run triggers at all */
 #define BTREE_TRIGGER_NORUN            (1U << __BTREE_TRIGGER_NORUN)
 
+/*
+ * If set, we're running transactional triggers as part of a transaction commit:
+ * triggers may generate new updates
+ *
+ * If cleared, and either BTREE_TRIGGER_INSERT|BTREE_TRIGGER_OVERWRITE are set,
+ * we're running atomic triggers during a transaction commit: we have our
+ * journal reservation, we're holding btree node write locks, and we know the
+ * transaction is going to commit (returning an error here is a fatal error,
+ * causing us to go emergency read-only)
+ */
+#define BTREE_TRIGGER_TRANSACTIONAL    (1U << __BTREE_TRIGGER_TRANSACTIONAL)
+
+/* @new is entering the btree */
 #define BTREE_TRIGGER_INSERT           (1U << __BTREE_TRIGGER_INSERT)
+
+/* @old is leaving the btree */
 #define BTREE_TRIGGER_OVERWRITE                (1U << __BTREE_TRIGGER_OVERWRITE)
 
+/* We're in gc/fsck: running triggers to recalculate e.g. disk usage */
 #define BTREE_TRIGGER_GC               (1U << __BTREE_TRIGGER_GC)
+
+/* signal from bucket invalidate path to alloc trigger */
 #define BTREE_TRIGGER_BUCKET_INVALIDATE        (1U << __BTREE_TRIGGER_BUCKET_INVALIDATE)
-#define BTREE_TRIGGER_NOATOMIC         (1U << __BTREE_TRIGGER_NOATOMIC)
 
-static inline int bch2_trans_mark_key(struct btree_trans *trans,
-                                     enum btree_id btree_id, unsigned level,
-                                     struct bkey_s_c old, struct bkey_i *new,
-                                     unsigned flags)
+static inline int bch2_key_trigger(struct btree_trans *trans,
+               enum btree_id btree, unsigned level,
+               struct bkey_s_c old, struct bkey_s new,
+               unsigned flags)
 {
-       const struct bkey_ops *ops = bch2_bkey_type_ops(old.k->type ?: new->k.type);
+       const struct bkey_ops *ops = bch2_bkey_type_ops(old.k->type ?: new.k->type);
 
-       return ops->trans_trigger
-               ? ops->trans_trigger(trans, btree_id, level, old, new, flags)
+       return ops->trigger
+               ? ops->trigger(trans, btree, level, old, new, flags)
                : 0;
 }
 
-static inline int bch2_trans_mark_old(struct btree_trans *trans,
-                                     enum btree_id btree_id, unsigned level,
-                                     struct bkey_s_c old, unsigned flags)
+static inline int bch2_key_trigger_old(struct btree_trans *trans,
+                                      enum btree_id btree_id, unsigned level,
+                                      struct bkey_s_c old, unsigned flags)
 {
        struct bkey_i deleted;
 
        bkey_init(&deleted.k);
        deleted.k.p = old.k->p;
 
-       return bch2_trans_mark_key(trans, btree_id, level, old, &deleted,
-                                  BTREE_TRIGGER_OVERWRITE|flags);
+       return bch2_key_trigger(trans, btree_id, level, old, bkey_i_to_s(&deleted),
+                               BTREE_TRIGGER_OVERWRITE|flags);
 }
 
-static inline int bch2_trans_mark_new(struct btree_trans *trans,
-                                     enum btree_id btree_id, unsigned level,
-                                     struct bkey_i *new, unsigned flags)
+static inline int bch2_key_trigger_new(struct btree_trans *trans,
+                                      enum btree_id btree_id, unsigned level,
+                                      struct bkey_s new, unsigned flags)
 {
        struct bkey_i deleted;
 
        bkey_init(&deleted.k);
-       deleted.k.p = new->k.p;
+       deleted.k.p = new.k->p;
 
-       return bch2_trans_mark_key(trans, btree_id, level, bkey_i_to_s_c(&deleted), new,
-                                  BTREE_TRIGGER_INSERT|flags);
+       return bch2_key_trigger(trans, btree_id, level, bkey_i_to_s_c(&deleted), new,
+                               BTREE_TRIGGER_INSERT|flags);
 }
 
 void bch2_bkey_renumber(enum btree_node_type, struct bkey_packed *, int);