Update bcachefs sources to 3856459b1b bcachefs: bch2_btree_iter_peek_node_and_restart()

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

diff --git a/libbcachefs/btree_update.h b/libbcachefs/btree_update.h
index 28f9585770068fd0ac5a1e701cf8c1cf6d037564..ee1d15931022f42a4331d48e70d0f1ffaffee501 100644 (file)
--- a/libbcachefs/btree_update.h
+++ b/libbcachefs/btree_update.h
@@ -8,13 +8,16 @@
 struct bch_fs;
 struct btree;
 
-void bch2_btree_node_lock_for_insert(struct btree_trans *, struct btree_path *,
-                                    struct btree *);
+void bch2_btree_node_prep_for_write(struct btree_trans *,
+                                   struct btree_path *, struct btree *);
 bool bch2_btree_bset_insert_key(struct btree_trans *, struct btree_path *,
                                struct btree *, struct btree_node_iter *,
                                struct bkey_i *);
 void bch2_btree_add_journal_pin(struct bch_fs *, struct btree *, u64);
 
+void bch2_btree_insert_key_leaf(struct btree_trans *, struct btree_path *,
+                               struct bkey_i *, u64);
+
 enum btree_insert_flags {
        /* First two bits for journal watermark: */
        __BTREE_INSERT_NOFAIL = 2,
@@ -55,7 +58,11 @@ int bch2_btree_delete_extent_at(struct btree_trans *, struct btree_iter *,
                                unsigned, unsigned);
 int bch2_btree_delete_at(struct btree_trans *, struct btree_iter *, unsigned);
 
-int __bch2_btree_insert(struct btree_trans *, enum btree_id, struct bkey_i *);
+int bch2_btree_insert_nonextent(struct btree_trans *, enum btree_id,
+                               struct bkey_i *, enum btree_update_flags);
+
+int __bch2_btree_insert(struct btree_trans *, enum btree_id, struct bkey_i *,
+                       enum btree_update_flags);
 int bch2_btree_insert(struct bch_fs *, enum btree_id, struct bkey_i *,
                     struct disk_reservation *, u64 *, int flags);
 
@@ -77,12 +84,15 @@ int bch2_trans_update_extent(struct btree_trans *, struct btree_iter *,
 
 int __must_check bch2_trans_update(struct btree_trans *, struct btree_iter *,
                                   struct bkey_i *, enum btree_update_flags);
+int __must_check bch2_trans_update_buffered(struct btree_trans *,
+                                           enum btree_id, struct bkey_i *);
 
 void bch2_trans_commit_hook(struct btree_trans *,
                            struct btree_trans_commit_hook *);
-int __bch2_trans_commit(struct btree_trans *);
+int __bch2_trans_commit(struct btree_trans *, unsigned);
 
-int bch2_trans_log_msg(struct btree_trans *, const char *);
+int bch2_trans_log_msg(struct btree_trans *, const char *, ...);
+int bch2_fs_log_msg(struct bch_fs *, const char *, ...);
 
 /**
  * bch2_trans_commit - insert keys at given iterator positions
@@ -90,7 +100,6 @@ int bch2_trans_log_msg(struct btree_trans *, const char *);
  * This is main entry point for btree updates.
  *
  * Return values:
- * -EINTR: locking changed, this function should be called again.
  * -EROFS: filesystem read only
  * -EIO: journal or btree node IO error
  */
@@ -101,35 +110,37 @@ static inline int bch2_trans_commit(struct btree_trans *trans,
 {
        trans->disk_res         = disk_res;
        trans->journal_seq      = journal_seq;
-       trans->flags            = flags;
 
-       return __bch2_trans_commit(trans);
+       return __bch2_trans_commit(trans, flags);
 }
 
-#define lockrestart_do(_trans, _do)                                    \
+#define commit_do(_trans, _disk_res, _journal_seq, _flags, _do)        \
+       lockrestart_do(_trans, _do ?: bch2_trans_commit(_trans, (_disk_res),\
+                                       (_journal_seq), (_flags)))
+
+#define nested_commit_do(_trans, _disk_res, _journal_seq, _flags, _do) \
+       nested_lockrestart_do(_trans, _do ?: bch2_trans_commit(_trans, (_disk_res),\
+                                       (_journal_seq), (_flags)))
+
+#define bch2_trans_do(_c, _disk_res, _journal_seq, _flags, _do)                \
 ({                                                                     \
+       struct btree_trans trans;                                       \
        int _ret;                                                       \
                                                                        \
-       do {                                                            \
-               bch2_trans_begin(_trans);                               \
-               _ret = (_do);                                           \
-       } while (_ret == -EINTR);                                       \
+       bch2_trans_init(&trans, (_c), 0, 0);                            \
+       _ret = commit_do(&trans, _disk_res, _journal_seq, _flags, _do); \
+       bch2_trans_exit(&trans);                                        \
                                                                        \
        _ret;                                                           \
 })
 
-#define __bch2_trans_do(_trans, _disk_res, _journal_seq, _flags, _do)  \
-       lockrestart_do(_trans, _do ?: bch2_trans_commit(_trans, (_disk_res),\
-                                       (_journal_seq), (_flags)))
-
-#define bch2_trans_do(_c, _disk_res, _journal_seq, _flags, _do)                \
+#define bch2_trans_run(_c, _do)                                                \
 ({                                                                     \
        struct btree_trans trans;                                       \
        int _ret;                                                       \
                                                                        \
        bch2_trans_init(&trans, (_c), 0, 0);                            \
-       _ret = __bch2_trans_do(&trans, _disk_res, _journal_seq, _flags, \
-                              _do);                                    \
+       _ret = (_do);                                                   \
        bch2_trans_exit(&trans);                                        \
                                                                        \
        _ret;                                                           \
@@ -140,6 +151,11 @@ static inline int bch2_trans_commit(struct btree_trans *trans,
             (_i) < (_trans)->updates + (_trans)->nr_updates;           \
             (_i)++)
 
+#define trans_for_each_wb_update(_trans, _i)                           \
+       for ((_i) = (_trans)->wb_updates;                               \
+            (_i) < (_trans)->wb_updates + (_trans)->nr_wb_updates;     \
+            (_i)++)
+
 static inline void bch2_trans_reset_updates(struct btree_trans *trans)
 {
        struct btree_insert_entry *i;
@@ -149,8 +165,18 @@ static inline void bch2_trans_reset_updates(struct btree_trans *trans)
 
        trans->extra_journal_res        = 0;
        trans->nr_updates               = 0;
+       trans->nr_wb_updates            = 0;
+       trans->wb_updates               = NULL;
        trans->hooks                    = NULL;
        trans->extra_journal_entries.nr = 0;
+
+       if (trans->fs_usage_deltas) {
+               trans->fs_usage_deltas->used = 0;
+               memset((void *) trans->fs_usage_deltas +
+                      offsetof(struct replicas_delta_list, memset_start), 0,
+                      (void *) &trans->fs_usage_deltas->memset_end -
+                      (void *) &trans->fs_usage_deltas->memset_start);
+       }
 }
 
 #endif /* _BCACHEFS_BTREE_UPDATE_H */