New upstream release

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

diff --git a/libbcachefs/move.h b/libbcachefs/move.h
index b14f679f6904eb80bf1dd4d5079b515b8e2ccb3a..547ee7b72c1617177056a3eb32061e345ed4351a 100644 (file)
--- a/libbcachefs/move.h
+++ b/libbcachefs/move.h
@@ -11,6 +11,9 @@ struct bch_read_bio;
 
 struct moving_context {
        struct bch_fs           *c;
+       struct list_head        list;
+       void                    *fn;
+
        struct bch_ratelimit    *rate;
        struct bch_move_stats   *stats;
        struct write_point_specifier wp;
@@ -19,15 +22,34 @@ struct moving_context {
 
        /* For waiting on outstanding reads and writes: */
        struct closure          cl;
+
+       struct mutex            lock;
        struct list_head        reads;
+       struct list_head        ios;
 
        /* in flight sectors: */
        atomic_t                read_sectors;
        atomic_t                write_sectors;
+       atomic_t                read_ios;
+       atomic_t                write_ios;
 
        wait_queue_head_t       wait;
 };
 
+#define move_ctxt_wait_event(_ctxt, _trans, _cond)                     \
+do {                                                                   \
+       bool cond_finished = false;                                     \
+       bch2_moving_ctxt_do_pending_writes(_ctxt, _trans);              \
+                                                                       \
+       if (_cond)                                                      \
+               break;                                                  \
+       __wait_event((_ctxt)->wait,                                     \
+                    bch2_moving_ctxt_next_pending_write(_ctxt) ||      \
+                    (cond_finished = (_cond)));                        \
+       if (cond_finished)                                              \
+               break;                                                  \
+} while (1)
+
 typedef bool (*move_pred_fn)(struct bch_fs *, void *, struct bkey_s_c,
                             struct bch_io_opts *, struct data_update_opts *);
 
@@ -35,6 +57,9 @@ void bch2_moving_ctxt_exit(struct moving_context *);
 void bch2_moving_ctxt_init(struct moving_context *, struct bch_fs *,
                           struct bch_ratelimit *, struct bch_move_stats *,
                           struct write_point_specifier, bool);
+struct moving_io *bch2_moving_ctxt_next_pending_write(struct moving_context *);
+void bch2_moving_ctxt_do_pending_writes(struct moving_context *,
+                                       struct btree_trans *);
 
 int bch2_scan_old_btree_nodes(struct bch_fs *, struct bch_move_stats *);
 
@@ -47,7 +72,9 @@ int bch2_move_data(struct bch_fs *,
                   bool,
                   move_pred_fn, void *);
 
-int __bch2_evacuate_bucket(struct moving_context *,
+int __bch2_evacuate_bucket(struct btree_trans *,
+                          struct moving_context *,
+                          struct move_bucket_in_flight *,
                           struct bpos, int,
                           struct data_update_opts);
 int bch2_evacuate_bucket(struct bch_fs *, struct bpos, int,
@@ -61,6 +88,9 @@ int bch2_data_job(struct bch_fs *,
                  struct bch_ioctl_data);
 
 void bch2_move_stats_init(struct bch_move_stats *stats, char *name);
+void bch2_data_jobs_to_text(struct printbuf *, struct bch_fs *);
+void bch2_fs_moving_ctxts_to_text(struct printbuf *, struct bch_fs *);
 
+void bch2_fs_move_init(struct bch_fs *);
 
 #endif /* _BCACHEFS_MOVE_H */