Update bcachefs sources to bed61fae3b bcachefs: Delete a faulty assertion

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

diff --git a/libbcachefs/move.h b/libbcachefs/move.h
index c5a7c0add1d695939c6b0b52123c5356d9a07228..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,7 +22,10 @@ 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;
@@ -68,6 +74,7 @@ int bch2_move_data(struct bch_fs *,
 
 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,
@@ -81,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 */