diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-06-29 17:14:06 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-07-12 08:52:53 -0400 |
| commit | a85283866a9eb632f81b7a132f1de0aa2ddd3dc6 (patch) | |
| tree | df2ac138c287577bc71f19b11466aceb0bfa1008 | |
| parent | 8005326ba1abeaf96c797bf69d6d32b00b00c217 (diff) | |
bcachefs: Fix move path when move_stats == NULL
This isn't done very often, but it is legitimate
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/move.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c index 093efb093c08..9748b865325d 100644 --- a/fs/bcachefs/move.c +++ b/fs/bcachefs/move.c @@ -148,13 +148,15 @@ void bch2_moving_ctxt_exit(struct moving_context *ctxt) { move_ctxt_wait_event(ctxt, NULL, list_empty(&ctxt->reads)); closure_sync(&ctxt->cl); - progress_list_del(ctxt->c, ctxt->stats); - EBUG_ON(atomic_read(&ctxt->write_sectors)); - trace_move_data(ctxt->c, - atomic64_read(&ctxt->stats->sectors_moved), - atomic64_read(&ctxt->stats->keys_moved)); + if (ctxt->stats) { + progress_list_del(ctxt->c, ctxt->stats); + + trace_move_data(ctxt->c, + atomic64_read(&ctxt->stats->sectors_moved), + atomic64_read(&ctxt->stats->keys_moved)); + } } void bch2_moving_ctxt_init(struct moving_context *ctxt, @@ -172,13 +174,14 @@ void bch2_moving_ctxt_init(struct moving_context *ctxt, ctxt->wp = wp; ctxt->wait_on_copygc = wait_on_copygc; - progress_list_add(c, stats); closure_init_stack(&ctxt->cl); INIT_LIST_HEAD(&ctxt->reads); init_waitqueue_head(&ctxt->wait); - if (stats) + if (stats) { + progress_list_add(c, stats); stats->data_type = BCH_DATA_user; + } } void bch_move_stats_init(struct bch_move_stats *stats, char *name) |